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

Commit 53185b3a authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Felipe Balbi
Browse files

usb: musb: dsps: start OTG timer on resume again 



Commit 468bcc2a ("usb: musb: dsps: kill OTG timer on suspend") stopped
the timer in suspend path but forgot the re-enable it in the resume
path. This patch fixes the behaviour.

Cc: <stable@vger.kernel.org> # v3.14+
Fixes 468bcc2a "usb: musb: dsps: kill OTG timer on suspend"
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent e0857ce5

drivers/usb/musb/musb_dsps.c

+3 −1
Original line number Diff line number Diff line
@@ -896,7 +896,9 @@ static int dsps_resume(struct device *dev) 
	dsps_writel(mbase, wrp->mode, glue->context.mode);

	dsps_writel(mbase, wrp->tx_mode, glue->context.tx_mode);

	dsps_writel(mbase, wrp->rx_mode, glue->context.rx_mode);

	setup_timer(&glue->timer, otg_timer, (unsigned long) musb);

	if (musb->xceiv->state == OTG_STATE_B_IDLE &&

	    musb->port_mode == MUSB_PORT_MODE_DUAL_ROLE)

		mod_timer(&glue->timer, jiffies + wrp->poll_seconds * HZ);



	return 0;

}