diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:57:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:57:31 +0200 |
| commit | 75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd (patch) | |
| tree | 7167fa30a5c46766c10c4b9a37d7bf9373c26c6d /arch/arm/mach-omap2/timer.c | |
| parent | 52648e83c9a6b9f7fc3dd272d4d10175e93aa62a (diff) | |
| parent | c0655fe9b0901a968800f56687be3c62b4cce5d2 (diff) | |
Merge branch 'linus' into x86/asm, to resolve conflicts
Conflicts:
tools/testing/selftests/x86/Makefile
tools/testing/selftests/x86/run_x86_tests.sh
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
| -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, if (IS_ERR(src)) return PTR_ERR(src); - if (clk_get_parent(timer->fclk) != src) { - r = clk_set_parent(timer->fclk, src); - if (r < 0) { - pr_warn("%s: %s cannot set source\n", __func__, - oh->name); - clk_put(src); - return r; - } + r = clk_set_parent(timer->fclk, src); + if (r < 0) { + pr_warn("%s: %s cannot set source\n", __func__, oh->name); + clk_put(src); + return r; } clk_put(src); |