diff options
| author | Jonghwan Choi <jhbird.choi@samsung.com> | 2012-06-20 17:05:37 +0900 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-07-04 05:44:22 +0100 |
| commit | 52c8c02cd596d6bd0a0a9313a6bc445b427f07d7 (patch) | |
| tree | 30d5b4b33e4d9256e0d5f355b57f15076760a3c0 | |
| parent | 6f4d747dfba5228b6041a9637fa0d944922ce72c (diff) | |
| download | lwn-52c8c02cd596d6bd0a0a9313a6bc445b427f07d7.tar.gz lwn-52c8c02cd596d6bd0a0a9313a6bc445b427f07d7.zip | |
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 <jhbird.choi@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/watchdog-reset.h | 2 |
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 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 */ |