projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
sunxi_wdt.c
diff --git
a/drivers/watchdog/sunxi_wdt.c
b/drivers/watchdog/sunxi_wdt.c
index a29afb37c48ca865f5cc6815e7a038956a519dc7..47bd8a14d01f5a3fe5cb6e3a5bcc30000e37cadf 100644
(file)
--- 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 */