Commit 150ed8ed authored by Akinobu Mita's avatar Akinobu Mita Committed by Wim Van Sebroeck

[WATCHDOG] sc1200wdt.c pnp unregister fix.

If no devices found or invalid parameter is specified,
scl200wdt_pnp_driver is left unregistered.
It breaks global list of pnp drivers.
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 5fdb51a1
...@@ -392,7 +392,7 @@ static int __init sc1200wdt_init(void) ...@@ -392,7 +392,7 @@ static int __init sc1200wdt_init(void)
if (io == -1) { if (io == -1) {
printk(KERN_ERR PFX "io parameter must be specified\n"); printk(KERN_ERR PFX "io parameter must be specified\n");
ret = -EINVAL; ret = -EINVAL;
goto out_clean; goto out_pnp;
} }
#if defined CONFIG_PNP #if defined CONFIG_PNP
...@@ -405,7 +405,7 @@ static int __init sc1200wdt_init(void) ...@@ -405,7 +405,7 @@ static int __init sc1200wdt_init(void)
if (!request_region(io, io_len, SC1200_MODULE_NAME)) { if (!request_region(io, io_len, SC1200_MODULE_NAME)) {
printk(KERN_ERR PFX "Unable to register IO port %#x\n", io); printk(KERN_ERR PFX "Unable to register IO port %#x\n", io);
ret = -EBUSY; ret = -EBUSY;
goto out_clean; goto out_pnp;
} }
ret = sc1200wdt_probe(); ret = sc1200wdt_probe();
...@@ -435,6 +435,11 @@ static int __init sc1200wdt_init(void) ...@@ -435,6 +435,11 @@ static int __init sc1200wdt_init(void)
out_io: out_io:
release_region(io, io_len); release_region(io, io_len);
out_pnp:
#if defined CONFIG_PNP
if (isapnp)
pnp_unregister_driver(&scl200wdt_pnp_driver);
#endif
goto out_clean; goto out_clean;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment