The patch titled pci: fix __pci_register_driver error handling has been removed from the -mm tree. Its filename was pci-fix-__pci_register_driver-error-handling.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: pci: fix __pci_register_driver error handling From: Akinobu Mita <akinobu.mita@xxxxxxxxx> __pci_register_driver() error path forgot to unwind. driver_unregister() needs to be called when pci_create_newid_file() failed. Cc: Greg Kroah-Hartman <gregkh@xxxxxxx> Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/pci/pci-driver.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff -puN drivers/pci/pci-driver.c~pci-fix-__pci_register_driver-error-handling drivers/pci/pci-driver.c --- a/drivers/pci/pci-driver.c~pci-fix-__pci_register_driver-error-handling +++ a/drivers/pci/pci-driver.c @@ -445,9 +445,12 @@ int __pci_register_driver(struct pci_dri /* register with core */ error = driver_register(&drv->driver); + if (error) + return error; - if (!error) - error = pci_create_newid_file(drv); + error = pci_create_newid_file(drv); + if (error) + driver_unregister(&drv->driver); return error; } _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are acpi-fix-single-linked-list-manipulation.patch drm-fix-return-value-check.patch git-input.patch input-make-serio_register_driver-return-error.patch input-check-serio_register_driver-error.patch input-check-whether-serio-dirver-registration-is-completed.patch input-change-to-gfp_kernel-for-serio_register_driver-event-allocation.patch git-mtd.patch gss_spkm3-fix-error-handling-in-module-init.patch auth_gss-unregister-gss_domain-when-unloading-module.patch auth_gss-unregister-gss_domain-when-unloading-module-fix.patch git-pcmcia.patch git-watchdog.patch paride-return-proper-error-code.patch bit-revese-library.patch crc32-replace-bitreverse-by-bitrev32.patch video-use-bitrev8.patch net-use-bitrev8.patch isdn-hisax-use-bitrev8.patch atm-ambassador-use-bitrev8.patch isdn-gigaset-use-bitrev8.patch isdn-fix-missing-unregister_capi_driver.patch fault-injection-documentation-and-scripts.patch fault-injection-capabilities-infrastructure.patch fault-injection-capabilities-infrastructure-tidy.patch fault-injection-capabilities-infrastructure-tweaks.patch fault-injection-capability-for-kmalloc.patch fault-injection-capability-for-alloc_pages.patch fault-injection-capability-for-disk-io.patch fault-injection-process-filtering-for-fault-injection-capabilities.patch fault-injection-stacktrace-filtering.patch fault-injection-Kconfig-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