The patch titled sl82c105: Switch to ref counting API has been added to the -mm tree. Its filename is sl82c105-switch-to-ref-counting-api.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: sl82c105: Switch to ref counting API From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Not sure how this one got missed in the great purge some time ago but it did. Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Cc: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/ide/pci/sl82c105.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff -puN drivers/ide/pci/sl82c105.c~sl82c105-switch-to-ref-counting-api drivers/ide/pci/sl82c105.c --- a/drivers/ide/pci/sl82c105.c~sl82c105-switch-to-ref-counting-api +++ a/drivers/ide/pci/sl82c105.c @@ -349,7 +349,7 @@ static unsigned int sl82c105_bridge_revi /* * The bridge should be part of the same device, but function 0. */ - bridge = pci_find_slot(dev->bus->number, + bridge = pci_get_bus_and_slot(dev->bus->number, PCI_DEVFN(PCI_SLOT(dev->devfn), 0)); if (!bridge) return -1; @@ -359,13 +359,15 @@ static unsigned int sl82c105_bridge_revi */ if (bridge->vendor != PCI_VENDOR_ID_WINBOND || bridge->device != PCI_DEVICE_ID_WINBOND_83C553 || - bridge->class >> 8 != PCI_CLASS_BRIDGE_ISA) + bridge->class >> 8 != PCI_CLASS_BRIDGE_ISA) { + pci_dev_put(bridge); return -1; - + } /* * We need to find function 0's revision, not function 1 */ pci_read_config_byte(bridge, PCI_REVISION_ID, &rev); + pci_dev_put(bridge); return rev; } _ Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxxxxxx are git-agpgart.patch git-agp-build-fix.patch git-powerpc.patch git-libata-all.patch pata_hpt37x-further-small-fixes.patch pata_hpt3x2n-add-hpt371n-support-and-other-bits.patch drivers-ata-pata_cmd640c-fix-build-with-config_pm=n.patch ata_timing-ensure-t-cycle-is-always-correct.patch libata-fix-hopefully-all-the-remaining-problems-with.patch testing-patch-for-ali-pata-fixes-hopefully-for-the-problems-with-atapi-dma.patch pata_ali-more-work.patch git-netdev-all.patch serial-suppress-rts-assertion-with-disabled-crtscts.patch drivers-scsi-ncr5380c-replacing-yield-with-a.patch drivers-scsi-mca_53c9xc-save_flags-cli-removal.patch driver_bfin_serial_core.patch driver_bfin_serial_core-update.patch documentation-ask-driver-writers-to-provide-pm-support.patch tty-clarify-documentation-of-write.patch tty-i386-x86_64-arbitary-speed-support.patch fixes-and-cleanups-for-earlyprintk-aka-boot-console.patch tty-remove-unnecessary-export-of-proc_clear_tty.patch tty-simplify-calling-of-put_pid.patch tty-introduce-no_tty-and-use-it-in-selinux.patch tty-in-tiocsctty-when-we-steal-a-tty-hang-it-up.patch protect-tty-drivers-list-with-tty_mutex.patch fix-82875-pci-setup.patch doc-kernel-parameters-use-x86-32-tag-instead-of-ia-32.patch remove-redundant-check-from-proc_sys_setattr.patch apm-fix-incorrect-comment.patch upper-32-bits.patch console-utf-8-fixes.patch add-pci_try_set_mwi.patch revoke-core-code-revoke-no-revoke-for-nommu.patch add-irqf_irqpoll-flag-common-code.patch add-irqf_irqpoll-flag-on-x86_64.patch add-irqf_irqpoll-flag-on-i386.patch add-irqf_irqpoll-flag-on-ia64.patch add-irqf_irqpoll-flag-on-sh.patch add-irqf_irqpoll-flag-on-arm.patch edd-switch-to-refcounting-pci-apis.patch sl82c105-switch-to-ref-counting-api.patch pci-syscallc-switch-to-refcounting-api.patch plan-b-switch-to-refcounting-pci-api.patch vioc_irq-switch-to-pci-refcount-safe-api.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html