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

Commit 84ac5d11 authored by Bin Liu's avatar Bin Liu Committed by Greg Kroah-Hartman
Browse files

usb: musb: only restore devctl when session was set in backup 



If the session bit was not set in the backup of devctl register,
restoring devctl would clear the session bit. Therefor, only restore
devctl register when the session bit was set in the backup.

This solves the device enumeration failure in otg mode exposed by commit
56f487c7 (PM / Runtime: Update last_busy in rpm_resume).

Cc: <stable@vger.kernel.org> # v4.2+
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6a619a8

drivers/usb/musb/musb_core.c

+2 −1
Original line number Diff line number Diff line
@@ -2418,6 +2418,7 @@ static void musb_restore_context(struct musb *musb) 
	musb_writew(musb_base, MUSB_INTRTXE, musb->intrtxe);

	musb_writew(musb_base, MUSB_INTRRXE, musb->intrrxe);

	musb_writeb(musb_base, MUSB_INTRUSBE, musb->context.intrusbe);

	if (musb->context.devctl & MUSB_DEVCTL_SESSION)

		musb_writeb(musb_base, MUSB_DEVCTL, musb->context.devctl);



	for (i = 0; i < musb->config->num_eps; ++i) {