diff options
| author | Jonghwan Choi <jhbird.choi@samsung.com> | 2012-06-20 17:05:37 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 09:03:22 -0700 |
| commit | 45500e587ad1c2ea809c52961675c4eb9befcab5 (patch) | |
| tree | 524a526626520a175906b88a3eedf808ddbdb0d4 /arch | |
| parent | 7abbc8e46545b3c98734484b4fbfaf849ed29c27 (diff) | |
| download | linux-3.10-45500e587ad1c2ea809c52961675c4eb9befcab5.tar.gz linux-3.10-45500e587ad1c2ea809c52961675c4eb9befcab5.tar.bz2 linux-3.10-45500e587ad1c2ea809c52961675c4eb9befcab5.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 f19aff19205..bc4db9b04e3 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 */ |