Commit 92af4fc6 authored by Tony Lindgren's avatar Tony Lindgren Committed by Greg Kroah-Hartman
Browse files

usb: musb: Fix suspend with devices connected for a64 



Pinephone running on Allwinner A64 fails to suspend with USB devices
connected as reported by Bhushan Shah <bshah@kde.org>. Reverting
commit 5fbf7a25 ("usb: musb: fix idling for suspend after
disconnect interrupt") fixes the issue.

Let's add suspend checks also for suspend after disconnect interrupt
quirk handling like we already do elsewhere.

Fixes: 5fbf7a25 ("usb: musb: fix idling for suspend after disconnect interrupt")
Reported-by: default avatarBhushan Shah <bshah@kde.org>
Tested-by: default avatarBhushan Shah <bshah@kde.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20210324071142.42264-1-tony@atomide.com


Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f978a30

drivers/usb/musb/musb_core.c

+8 −4
Original line number Diff line number Diff line
@@ -2004,10 +2004,14 @@ static void musb_pm_runtime_check_session(struct musb *musb) 
		MUSB_DEVCTL_HR;

	switch (devctl & ~s) {

	case MUSB_QUIRK_B_DISCONNECT_99:

		if (musb->quirk_retries && !musb->flush_irq_work) {

			musb_dbg(musb, "Poll devctl in case of suspend after disconnect\n");

			schedule_delayed_work(&musb->irq_work,

					      msecs_to_jiffies(1000));

			musb->quirk_retries--;

			break;

		}

		fallthrough;

	case MUSB_QUIRK_B_INVALID_VBUS_91:

		if (musb->quirk_retries && !musb->flush_irq_work) {

			musb_dbg(musb,