diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-29 13:53:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-29 13:53:05 -0800 |
| commit | 7a20655bc5316ccec0f036cde46e609ba5571f5e (patch) | |
| tree | c61933e48a85737b8279512d661357d6bb83ea4c /drivers | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 (diff) | |
| parent | [WATCHDOG] sc1200wdt.c pnp unregister fix. (diff) | |
| download | linux-dev-7a20655bc5316ccec0f036cde46e609ba5571f5e.tar.xz linux-dev-7a20655bc5316ccec0f036cde46e609ba5571f5e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] sc1200wdt.c pnp unregister fix.
Diffstat (limited to 'drivers')
| -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; } |