hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Akinobu Mita 2006-10-29 03:43:19 +09:00 committed by Wim Van Sebroeck
parent 5fdb51a10f
commit 150ed8ed63
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/char/watchdog/sc1200wdt.c
View File

@ -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)
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 @@ out_rbt:
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;
} }