summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorFrancesco Lavra <francescolavra.fl@gmail.com>2015-07-25 08:25:18 +0200
committerWim Van Sebroeck <wim@iguana.be>2015-09-09 21:34:14 +0200
commit0919e4445190da18496d31aac08b90828a47d45f (patch)
treedc60c184638694f7e5f8b101b447accaa6f92378 /drivers/watchdog
parent5724485b185a4ac4bb96149718ff736c5ef5c169 (diff)
downloadop-kernel-dev-0919e4445190da18496d31aac08b90828a47d45f.zip
op-kernel-dev-0919e4445190da18496d31aac08b90828a47d45f.tar.gz
watchdog: sunxi: fix activation of system reset
Commit f2147de33470 ("watchdog: sunxi: support parameterized compatible strings") introduced a regression in sunxi_wdt_start(), by which the system reset function of the watchdog is not enabled upon starting the watchdog. As a result, the system is not reset when the watchdog expires. Fix it. Fixes: f2147de33470 ("watchdog: sunxi: support parameterized compatible strings") Signed-off-by: Francesco Lavra <francescolavra.fl@gmail.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/sunxi_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index a29afb3..47bd8a1 100644
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -184,7 +184,7 @@ static int sunxi_wdt_start(struct watchdog_device *wdt_dev)
/* Set system reset function */
reg = readl(wdt_base + regs->wdt_cfg);
reg &= ~(regs->wdt_reset_mask);
- reg |= ~(regs->wdt_reset_val);
+ reg |= regs->wdt_reset_val;
writel(reg, wdt_base + regs->wdt_cfg);
/* Enable watchdog */
OpenPOWER on IntegriCloud