Merge commit '7185684' into omap-for-v3.10/timer

Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 773733fccd83..06cbb49cc976 100644
--- 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);