diff options
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index cef67af9e9b8..cac46d852da1 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
| @@ -298,14 +298,11 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, | |||
| 298 | if (IS_ERR(src)) | 298 | if (IS_ERR(src)) |
| 299 | return PTR_ERR(src); | 299 | return PTR_ERR(src); |
| 300 | 300 | ||
| 301 | if (clk_get_parent(timer->fclk) != src) { | 301 | r = clk_set_parent(timer->fclk, src); |
| 302 | r = clk_set_parent(timer->fclk, src); | 302 | if (r < 0) { |
| 303 | if (r < 0) { | 303 | pr_warn("%s: %s cannot set source\n", __func__, oh->name); |
| 304 | pr_warn("%s: %s cannot set source\n", __func__, | 304 | clk_put(src); |
| 305 | oh->name); | 305 | return r; |
| 306 | clk_put(src); | ||
| 307 | return r; | ||
| 308 | } | ||
| 309 | } | 306 | } |
| 310 | 307 | ||
| 311 | clk_put(src); | 308 | clk_put(src); |