Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3670901f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fix from Ingo Molnar:
 "A single clocksource driver suspend/resume fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clockevents/drivers/sh_cmt: Only perform clocksource suspend/resume if enabled
parents b25c6cee 54d46b7f

drivers/clocksource/sh_cmt.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -661,6 +661,9 @@ static void sh_cmt_clocksource_suspend(struct clocksource *cs) 
{

{

	struct sh_cmt_channel *ch = cs_to_sh_cmt(cs);

	struct sh_cmt_channel *ch = cs_to_sh_cmt(cs);





	if (!ch->cs_enabled)

		return;



	sh_cmt_stop(ch, FLAG_CLOCKSOURCE);

	sh_cmt_stop(ch, FLAG_CLOCKSOURCE);

	pm_genpd_syscore_poweroff(&ch->cmt->pdev->dev);

	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);

	struct sh_cmt_channel *ch = cs_to_sh_cmt(cs);





	if (!ch->cs_enabled)

		return;



	pm_genpd_syscore_poweron(&ch->cmt->pdev->dev);

	pm_genpd_syscore_poweron(&ch->cmt->pdev->dev);

	sh_cmt_start(ch, FLAG_CLOCKSOURCE);

	sh_cmt_start(ch, FLAG_CLOCKSOURCE);

}

}