aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonghwan Choi <jhbird.choi@samsung.com>2012-06-20 08:05:37 (GMT)
committerAntti Palosaari <crope@iki.fi>2012-07-03 19:57:39 (GMT)
commit0bc420b7b73d55c76e6f7399660ab3ed1502026e (patch)
treea8810c8977514d7d7123977b1c4f99ad80fc8790
parentcdc02e3a7aa470be6bed8d189bc2c0f845ae7d92 (diff)
ARM: SAMSUNG: Should check for IS_ERR(clk) instead of NULL
On the error condition clk_get() returns ERR_PTR(). Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> Cc: Stable <stable@vger.kernel.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/plat-samsung/include/plat/watchdog-reset.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/watchdog-reset.h b/arch/arm/plat-samsung/include/plat/watchdog-reset.h
index f19aff1..bc4db9b 100644
--- 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 */

Privacy Policy