From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Tue, 5 May 2015 11:02:21 -0700 Subject: [PATCH] ARM: OMAP2+: Fix bogus struct clk comparison for timer clock Message-ID: <1430848941-27106-1-git-send-email-tony@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org With recent changes to use determine_rate, the comparison of two clocks won't work without doing __clk_get_hw on the clocks first. Cc: Michael Turquette Cc: Paul Walmsley Cc: Stephen Boyd Cc: Tero Kristo Cc: Tomeu Vizoso Signed-off-by: Tony Lindgren --- Found one more of these, the coccinelle scripts do not seem to match this? --- arch/arm/mach-omap2/timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index cef67af..22c7a8e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -298,7 +299,7 @@ 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) { + if (__clk_get_hw(clk_get_parent(timer->fclk)) != __clk_get_hw(src)) { r = clk_set_parent(timer->fclk, src); if (r < 0) { pr_warn("%s: %s cannot set source\n", __func__, -- 2.1.4