From: Jonghwan Choi Date: Wed, 20 Jun 2012 08:05:37 +0000 (+0900) Subject: ARM: SAMSUNG: Should check for IS_ERR(clk) instead of NULL X-Git-Tag: v3.2.22~19 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=52c8c02cd596d6bd0a0a9313a6bc445b427f07d7;p=karo-tx-linux.git ARM: SAMSUNG: Should check for IS_ERR(clk) instead of NULL commit a5d8f4765f0e92ef027492a8cb979c5b8d45f2c3 upstream. On the error condition clk_get() returns ERR_PTR(). Signed-off-by: Jonghwan Choi Signed-off-by: Kukjin Kim Signed-off-by: Ben Hutchings --- diff --git a/arch/arm/plat-samsung/include/plat/watchdog-reset.h b/arch/arm/plat-samsung/include/plat/watchdog-reset.h index 40dbb2b0ae22..11b19ea9a0d9 100644 --- a/arch/arm/plat-samsung/include/plat/watchdog-reset.h +++ b/arch/arm/plat-samsung/include/plat/watchdog-reset.h @@ -24,7 +24,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 */