Skip to content

Commit

Permalink
arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vasiliy Kulikov authored and Tony Lindgren committed Dec 7, 2010
1 parent 859158b commit cb9675f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/plat-omap/counter_32k.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit cb9675f

Please sign in to comment.