Skip to contentSkip to conversation

sc1200wdt: fix missing pnp_unregister_driver()

PATCH New Akinobu Mita 1 participant 1 message Oct 28, 2006 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 <[email protected]>
 drivers/char/watchdog/sc1200wdt.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/char/watchdog/sc1200wdt.c +7 -2
Index: 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;
 }