mirror of https://gitee.com/openkylin/linux.git
[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:
parent
fd0c5eca44
commit
58c6570add
|
@ -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 @@ static int __init sc1200wdt_init(void)
|
|||
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue