* [PATCH 1/2] watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
@ 2012-01-18 11:25 Axel Lin
2012-01-18 11:26 ` Mark Brown
2012-01-18 11:26 ` [PATCH 2/2] watchdog: wafer5823wdt: " Axel Lin
0 siblings, 2 replies; 3+ messages in thread
From: Axel Lin @ 2012-01-18 11:25 UTC (permalink / raw)
To: linux-kernel; +Cc: Mark Brown, Wim Van Sebroeck, linux-watchdog
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>
---
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 909c786..5d7113c 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;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
2012-01-18 11:25 [PATCH 1/2] watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options Axel Lin
@ 2012-01-18 11:26 ` Mark Brown
2012-01-18 11:26 ` [PATCH 2/2] watchdog: wafer5823wdt: " Axel Lin
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2012-01-18 11:26 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Wim Van Sebroeck, linux-watchdog
On Wed, Jan 18, 2012 at 07:25:01PM +0800, Axel Lin wrote:
> 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] watchdog: wafer5823wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
2012-01-18 11:25 [PATCH 1/2] watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options Axel Lin
2012-01-18 11:26 ` Mark Brown
@ 2012-01-18 11:26 ` Axel Lin
1 sibling, 0 replies; 3+ messages in thread
From: Axel Lin @ 2012-01-18 11:26 UTC (permalink / raw)
To: linux-kernel; +Cc: Justin Cormack, Wim Van Sebroeck, linux-watchdog
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 <axel.lin@gmail.com>
---
drivers/watchdog/wafer5823wdt.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 42e940c..c3c3188 100644
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -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;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-18 11:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-18 11:25 [PATCH 1/2] watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options Axel Lin
2012-01-18 11:26 ` Mark Brown
2012-01-18 11:26 ` [PATCH 2/2] watchdog: wafer5823wdt: " Axel Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).