diff options
| author |   Axel Lin <axel.lin@gmail.com> | 2012-01-18 19:25:01 +0800 |
|---|---|---|
| committer |   Wim Van Sebroeck <wim@iguana.be> | 2012-01-27 09:55:04 +0100 |
| commit | ebe06e826faed9d710c3d49fe336c74b5f3a5f2a (patch) | |
| tree | 0e9978a29da94a690c3d83f8ee45387f32cd1bd6 /drivers | |
| parent | watchdog: Return proper error in nuc900wdt_probe if misc_register fails (diff) | |
| download | linux-dev-ebe06e826faed9d710c3d49fe336c74b5f3a5f2a.tar.xz linux-dev-ebe06e826faed9d710c3d49fe336c74b5f3a5f2a.zip | |
watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
While receiving WDIOS_DISABLECARD option for WDIOC_SETOPTIONS command,
call wm8350_wdt_stop() to disable watchdog.
Call wm8350_wdt_start() while receiving WDIOS_ENABLECARD option.
Current code has reverse behavior.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/wm8350_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c index 909c78650d3e..5d7113c7e501 100644 --- a/drivers/watchdog/wm8350_wdt.c +++ b/drivers/watchdog/wm8350_wdt.c @@ -212,10 +212,10 @@ static long wm8350_wdt_ioctl(struct file *file, unsigned int cmd, /* Setting both simultaneously means at least one must fail */ if (options == WDIOS_DISABLECARD) - ret = wm8350_wdt_start(wm8350); + ret = wm8350_wdt_stop(wm8350); if (options == WDIOS_ENABLECARD) - ret = wm8350_wdt_stop(wm8350); + ret = wm8350_wdt_start(wm8350); break; } |