X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Fwatchdog%2Fsc1200wdt.c;h=131193a7acdfd0bb07660095e0ff57c500eed6cb;hb=ea1e61cbb9b1397192a478eca4c3138bd1b4441c;hp=3fb83b0c28c23a58862b55f482ed2e8c3c0003c9;hpb=af56e0aa35f3ae2a4c1a6d1000702df1dd78cb76;p=cascardo%2Flinux.git

diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c
index 3fb83b0c28c2..131193a7acdf 100644
--- a/drivers/watchdog/sc1200wdt.c
+++ b/drivers/watchdog/sc1200wdt.c
@@ -409,8 +409,9 @@ static int __init sc1200wdt_init(void)
 #if defined CONFIG_PNP
 	/* now that the user has specified an IO port and we haven't detected
 	 * any devices, disable pnp support */
+	if (isapnp)
+		pnp_unregister_driver(&scl200wdt_pnp_driver);
 	isapnp = 0;
-	pnp_unregister_driver(&scl200wdt_pnp_driver);
 #endif
 
 	if (!request_region(io, io_len, SC1200_MODULE_NAME)) {
@@ -476,4 +477,3 @@ MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>");
 MODULE_DESCRIPTION(
 	"Driver for National Semiconductor PC87307/PC97307 watchdog component");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);