diff options
| author | Jonghwan Choi <jhbird.choi@samsung.com> | 2012-06-20 04:05:37 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-06-20 04:05:44 -0400 |
| commit | a5d8f4765f0e92ef027492a8cb979c5b8d45f2c3 (patch) | |
| tree | 96b10a1dce35879407f6959a81ba29e569117b1f /arch | |
| parent | 485802a6c524e62b5924849dd727ddbb1497cc71 (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>
Diffstat (limited to 'arch')
| -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 f19aff19205c..bc4db9b04e36 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) | |||
| 25 | 25 | ||
| 26 | __raw_writel(0, S3C2410_WTCON); /* disable watchdog, to be safe */ | 26 | __raw_writel(0, S3C2410_WTCON); /* disable watchdog, to be safe */ |
| 27 | 27 | ||
| 28 | if (s3c2410_wdtclk) | 28 | if (!IS_ERR(s3c2410_wdtclk)) |
| 29 | clk_enable(s3c2410_wdtclk); | 29 | clk_enable(s3c2410_wdtclk); |
| 30 | 30 | ||
| 31 | /* put initial values into count and data */ | 31 | /* put initial values into count and data */ |