Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[cascardo/linux.git] / arch / arm / mach-omap2 / timer.c

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index ea6ea9a..63e6384 100644 (file)
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -288,7 +288,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
                        r = -EINVAL;
                } else {
                        r = clk_set_parent(timer->fclk, src);
-                       if (IS_ERR_VALUE(r))
+                       if (r < 0)
                                pr_warn("%s: %s cannot set source\n",
                                        __func__, oh->name);
                        clk_put(src);