diff options
| author | Vasiliy Kulikov <segoon@openwall.com> | 2010-11-26 18:06:02 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-07 01:00:16 +0100 |
| commit | cb9675f3282f5565cc9e3698cc847355c1194871 (patch) | |
| tree | aca9ebc287f368f1497de2aa040fbabc6e5c46d1 /arch/arm/plat-omap/counter_32k.c | |
| parent | omap: nand: remove hardware ECC as default (diff) | |
| download | linux-cb9675f3282f5565cc9e3698cc847355c1194871.tar.xz linux-cb9675f3282f5565cc9e3698cc847355c1194871.zip | |
arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check
clk_get() returns ERR_PTR() on error, not NULL.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
[tony@atomide.com: updated to include err.h to compile on omap1]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/counter_32k.c')
| -rw-r--r-- | arch/arm/plat-omap/counter_32k.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c index 155fe43a672b..8722a136f3a5 100644 --- a/arch/arm/plat-omap/counter_32k.c +++ b/arch/arm/plat-omap/counter_32k.c @@ -16,6 +16,7 @@ #include <linux/init.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/err.h> #include <plat/common.h> #include <plat/board.h> @@ -164,7 +165,7 @@ static int __init omap_init_clocksource_32k(void) return -ENODEV; sync_32k_ick = clk_get(NULL, "omap_32ksync_ick"); - if (sync_32k_ick) + if (!IS_ERR(sync_32k_ick)) clk_enable(sync_32k_ick); clocksource_32k.mult = clocksource_hz2mult(32768, |