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

Commit 2fdc8277 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v.16/dmtimer-fix' into omap-for-v4.17/timer

parents 1ff4cb67 ba688783

arch/arm/plat-omap/dmtimer.c

+2 −5
Original line number Diff line number Diff line
@@ -888,11 +888,8 @@ static int omap_dm_timer_probe(struct platform_device *pdev) 
	timer->irq = irq->start;

	timer->pdev = pdev;



	/* Skip pm_runtime_enable for OMAP1 */

	if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {

	pm_runtime_enable(dev);

	pm_runtime_irq_safe(dev);

	}



	if (!timer->reserved) {

		ret = pm_runtime_get_sync(dev);