diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2006-10-29 03:43:19 +0900 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2006-10-29 10:27:43 +0100 |
| commit | 58c6570add83e30c0905885171fbffc134441165 (patch) | |
| tree | f539147577267ec5fdd7b6a59758361b5045241f /drivers/char/watchdog | |
| parent | fd0c5eca447254682a8372bc73b6bdcc16bf6777 (diff) | |
| download | talos-op-linux-58c6570add83e30c0905885171fbffc134441165.tar.gz talos-op-linux-58c6570add83e30c0905885171fbffc134441165.zip | |
[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: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'drivers/char/watchdog')
| -rw-r--r-- | drivers/char/watchdog/sc1200wdt.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c index d8d0f28e0acf..e3239833e4b0 100644 --- a/drivers/char/watchdog/sc1200wdt.c +++ b/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; } |
