diff options
| author | Alan <gnomes@lxorguk.ukuu.org.uk> | 2013-12-04 19:31:52 +0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2013-12-10 11:48:15 +0400 |
| commit | dace8bbfccfd9e4fcccfffcfbd82881fda3e756f (patch) | |
| tree | 95032d1270fd51614b0553252227fbb36639ddad /drivers/watchdog | |
| parent | 9539210e17dc09ea1472076c297d461c7507a5bb (diff) | |
| download | linux-dace8bbfccfd9e4fcccfffcfbd82881fda3e756f.tar.xz | |
sc1200_wdt: Fix oops
If loaded with isapnp = 0 the driver explodes. This is catching
people out now and then. What should happen in the working case is
a complete mystery and the code appears terminally confused, but we
can at least make the error path work properly.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Partially-Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=53991
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/sc1200wdt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c index 3b9fff9dcf65..131193a7acdf 100644 --- a/drivers/watchdog/sc1200wdt.c +++ b/drivers/watchdog/sc1200wdt.c @@ -409,8 +409,9 @@ static int __init sc1200wdt_init(void) #if defined CONFIG_PNP /* now that the user has specified an IO port and we haven't detected * any devices, disable pnp support */ + if (isapnp) + pnp_unregister_driver(&scl200wdt_pnp_driver); isapnp = 0; - pnp_unregister_driver(&scl200wdt_pnp_driver); #endif if (!request_region(io, io_len, SC1200_MODULE_NAME)) { |