--- zzzz-none-000/linux-2.6.19.2/drivers/char/watchdog/sc1200wdt.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/char/watchdog/sc1200wdt.c	2007-01-11 07:38:19.000000000 +0000
@@ -392,7 +392,7 @@
 	if (io == -1) {
 		printk(KERN_ERR PFX "io parameter must be specified\n");
 		ret = -EINVAL;
-		goto out_pnp;
+		goto out_clean;
 	}
 
 #if defined CONFIG_PNP
@@ -405,7 +405,7 @@
 	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_pnp;
+		goto out_clean;
 	}
 
 	ret = sc1200wdt_probe();
@@ -435,11 +435,6 @@
 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;
 }