The patch titled From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> has been added to the -mm tree. Its filename is edd-switch-to-pci_get-based-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: From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Cc: Matt Domsch <Matt_Domsch@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/firmware/edd.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff -puN drivers/firmware/edd.c~edd-switch-to-pci_get-based-api drivers/firmware/edd.c --- a/drivers/firmware/edd.c~edd-switch-to-pci_get-based-api +++ a/drivers/firmware/edd.c @@ -669,7 +669,7 @@ edd_get_pci_dev(struct edd_device *edev) struct edd_info *info = edd_dev_get_info(edev); if (edd_dev_is_type(edev, "PCI")) { - return pci_find_slot(info->params.interface_path.pci.bus, + return pci_get_bus_and_slot(info->params.interface_path.pci.bus, PCI_DEVFN(info->params.interface_path.pci.slot, info->params.interface_path.pci. function)); @@ -682,9 +682,12 @@ edd_create_symlink_to_pcidev(struct edd_ { struct pci_dev *pci_dev = edd_get_pci_dev(edev); + int ret; if (!pci_dev) return 1; - return sysfs_create_link(&edev->kobj,&pci_dev->dev.kobj,"pci_dev"); + ret = sysfs_create_link(&edev->kobj,&pci_dev->dev.kobj,"pci_dev"); + pci_dev_put(pci_dev); + return ret; } static inline void _ Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxxxxxx are pata_acpi-restore-driver-vs-libata-clean-up-sff-init-mess-fix.patch libata-add-support-for-ata_16-on-atapi.patch fix-build-failure-for-drivers-ata-pata_sccc.patch pata_hpt366-enable-bits-are-unreliable-so-dont-use-them.patch hpt3x2n-correct-revision-boundary.patch pata_sis-fix-and-clean-up-some-timing-setups.patch ata_piix-clean-up.patch libata-kiss-post_set_mode-goodbye.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 serial-use-resource_size_t-for-port-io-addresses.patch add-pci_try_set_mwi.patch fix-pci_find_present.patch pci_find_slot-mark-deprecated.patch drivers-scsi-ncr5380c-replacing-yield-with-a.patch watchdog-documentation.patch doc-kernel-parameters-use-x86-32-tag-instead-of-ia-32.patch make-proc-tty-drivers-use-seq_list_xxx-helpers.patch update-zilog-timeout.patch edd-switch-to-pci_get-based-api.patch i2o_cfg_passthru-cleanup.patch i2o_cfg_passthru-cleanup-fix.patch wrong-memory-access-in-i2o_block_device_lock.patch i2o-message-leak-in-i2o_msg_post_wait_mem.patch i2o-proc-reading-oops.patch i2o-debug-output-cleanup.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