diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 16:31:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 16:31:29 -0400 |
| commit | 33b9f582c5c1db515412cc7efff28f7d1779321f (patch) | |
| tree | 60ea1b403b41f651bc570f4c368ba82064880796 /arch/arm/mach-omap2/timer.c | |
| parent | 946342d03ec4e8367bba7bb99e7155e97f69058a (diff) | |
| parent | 008ca431822f39a023322b3598d8366faf46cfc1 (diff) | |
Merge branch 'cleanup' into for-linus
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index f62b509ed08d..a97026400af7 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
| @@ -287,7 +287,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, | |||
| 287 | r = -EINVAL; | 287 | r = -EINVAL; |
| 288 | } else { | 288 | } else { |
| 289 | r = clk_set_parent(timer->fclk, src); | 289 | r = clk_set_parent(timer->fclk, src); |
| 290 | if (IS_ERR_VALUE(r)) | 290 | if (r < 0) |
| 291 | pr_warn("%s: %s cannot set source\n", | 291 | pr_warn("%s: %s cannot set source\n", |
| 292 | __func__, oh->name); | 292 | __func__, oh->name); |
| 293 | clk_put(src); | 293 | clk_put(src); |