timer fix
Linus,
Please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
# HEAD: 54d46b7fbcbd00fe4b20a27208e5909facc714e3 clockevents/drivers/sh_cmt: Only perform clocksource suspend/resume if enabled
A single clocksource driver suspend/resume fix.
Thanks,
Ingo
------------------>
Geert Uytterhoeven (1):
clockevents/drivers/sh_cmt: Only perform clocksource suspend/resume if enabled
drivers/clocksource/sh_cmt.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clocksource/sh_cmt.c +6 -0
@@ -661,6 +661,9 @@ static void sh_cmt_clocksource_suspend(struct clocksource *cs) {struct sh_cmt_channel *ch =cs_to_sh_cmt (cs); +if (!ch->cs_enabled) +return ; +sh_cmt_stop (ch,FLAG_CLOCKSOURCE );pm_genpd_syscore_poweroff (&ch->cmt->pdev->dev); }
@@ -669,6 +672,9 @@ static void sh_cmt_clocksource_resume(struct clocksource *cs) {struct sh_cmt_channel *ch =cs_to_sh_cmt (cs); +if (!ch->cs_enabled) +return ; +pm_genpd_syscore_poweron (&ch->cmt->pdev->dev);sh_cmt_start (ch,FLAG_CLOCKSOURCE ); }