The patch titled
sc1200wdt: fix missing pnp_unregister_driver()
has been removed from the -mm tree. Its filename was
sc1200wdt-fix-missing-pnp_unregister_driver.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: sc1200wdt: fix missing pnp_unregister_driver()
From: Akinobu Mita <akinobu.mita@xxxxxxxxx>
If no devices found or invalid parameter is specified, scl200wdt_pnp_driver
is left unregistered. It breaks global list of pnp drivers.
Cc: Wim Van Sebroeck <wim@xxxxxxxxx>
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/watchdog/sc1200wdt.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff -puN drivers/char/watchdog/sc1200wdt.c~sc1200wdt-fix-missing-pnp_unregister_driver drivers/char/watchdog/sc1200wdt.c
--- a/drivers/char/watchdog/sc1200wdt.c~sc1200wdt-fix-missing-pnp_unregister_driver
+++ a/drivers/char/watchdog/sc1200wdt.c
@@ -392,7 +392,7 @@ static int __init sc1200wdt_init(void)
if (io == -1) {
printk(KERN_ERR PFX "io parameter must be specified\n");
ret = -EINVAL;
- goto out_clean;
+ goto out_pnp;
}
#if defined CONFIG_PNP
@@ -405,7 +405,7 @@ static int __init sc1200wdt_init(void)
if (!request_region(io, io_len, SC1200_MODULE_NAME)) {
printk(KERN_ERR PFX "Unable to register IO port %#x\n", io);
ret = -EBUSY;
- goto out_clean;
+ goto out_pnp;
}
ret = sc1200wdt_probe();
@@ -435,6 +435,11 @@ out_rbt:
out_io:
release_region(io, io_len);
+out_pnp:
+#if defined CONFIG_PNP
+ if (isapnp)
+ pnp_unregister_driver(&scl200wdt_pnp_driver);
+#endif
goto out_clean;
}
_
Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are
isdn-gigaset-avoid-cs-dev-null-pointer-dereference.patch
acpi-fix-single-linked-list-manipulation.patch
debugfs-check-return-value-correctly.patch
lightning-return-proper-return-code.patch
git-mtd.patch
n2-fix-confusing-error-code.patch
tokenring-fix-module_init-error-handling.patch
gss_spkm3-fix-error-handling-in-module-init.patch
git-pcmcia.patch
pci-fix-__pci_register_driver-error-handling.patch
acpiphp-fix-missing-acpiphp_glue_exit.patch
git-watchdog.patch
edac_mc-fix-error-handling.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
-
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
