[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20061028184319.GD9973@localhost>
Date: Sun, 29 Oct 2006 03:43:19 +0900
From: Akinobu Mita <akinobu.mita@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Wim Van Sebroeck <wim@...ana.be>
Subject: [PATCH] sc1200wdt: fix missing pnp_unregister_driver()
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@...ana.be>
Signed-off-by: Akinobu Mita <akinobu.mita@...il.com>
drivers/char/watchdog/sc1200wdt.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
Index: work-fault-inject/drivers/char/watchdog/sc1200wdt.c
===================================================================
--- work-fault-inject.orig/drivers/char/watchdog/sc1200wdt.c
+++ work-fault-inject/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;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists