watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options

PATCH In review Axel Lin 2 participants 3 messages Jan 18, 2012

Subsystems (2)

Watchdog device drivers Wolfson microelectronics drivers

lore

Share & tools

lore

Axel Lin

author

2012-01-18 11:25 UTC #0 lore raw

PATCH 1/2 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 <[email protected]>

---
 drivers/watchdog/wm8350_wdt.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/watchdog/wm8350_wdt.c +2 -2

index 909c786..5d7113c 100644
@@ -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;
 	}

Signature · 1 line

1.7.5.4

Mark Brown

Acked-by on v1 1/2

2012-01-18 11:26 UTC #1 lore raw

Quoted 7 lines · Axel Lin

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 <[email protected]>

Acked-by Mark Brown <[email protected]>

Axel Lin

author

2012-01-18 11:26 UTC #2 lore raw

PATCH 2/2 watchdog: wafer5823wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options

In reply to Axel Lin

While receiving WDIOS_DISABLECARD option for WDIOC_SETOPTIONS command, call wafwdt_stop() to disable watchdog.
Call wafwdt_start() while receiving WDIOS_ENABLECARD option.

Current code has reverse behavior.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/watchdog/wafer5823wdt.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/watchdog/wafer5823wdt.c +2 -2

index 42e940c..c3c3188 100644
@@ -152,12 +152,12 @@ static long wafwdt_ioctl(struct file *file, unsigned int cmd,
 			return -EFAULT;
 
 		if (options & WDIOS_DISABLECARD) {
-			wafwdt_start();
+			wafwdt_stop();
 			retval = 0;
 		}
 
 		if (options & WDIOS_ENABLECARD) {
-			wafwdt_stop();
+			wafwdt_start();
 			retval = 0;
 		}

Signature · 1 line

1.7.5.4