projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git]
/
arch
/
arm
/
plat-samsung
/
include
/
plat
/
watchdog-reset.h
diff --git
a/arch/arm/plat-samsung/include/plat/watchdog-reset.h
b/arch/arm/plat-samsung/include/plat/watchdog-reset.h
index f19aff19205c3d4090c6d239f574c6d788ed8af6..bc4db9b04e36e101de8885e6285e23baf60f9b89 100644
(file)
--- a/
arch/arm/plat-samsung/include/plat/watchdog-reset.h
+++ b/
arch/arm/plat-samsung/include/plat/watchdog-reset.h
@@
-25,7
+25,7
@@
static inline void arch_wdt_reset(void)
__raw_writel(0, S3C2410_WTCON); /* disable watchdog, to be safe */
- if (
s3c2410_wdtclk
)
+ if (
!IS_ERR(s3c2410_wdtclk)
)
clk_enable(s3c2410_wdtclk);
/* put initial values into count and data */
This page took
0.024038 seconds
and
5
git commands to generate.