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

Commit 7d9645fd authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Greg Kroah-Hartman
Browse files

USB: musb_core: make disconnect and suspend interrupts work again 



Commit 1c25fda4 (usb: musb: handle irqs in the
order dictated by programming guide) forgot to get rid of the old 'STAGE0_MASK'
filter for calling musb_stage0_irq(), so now disconnect and suspend interrupts
are effectively ignored...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarAjay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 48826626

drivers/usb/musb/musb_core.c

+1 −5
Original line number Diff line number Diff line
@@ -451,10 +451,6 @@ void musb_hnp_stop(struct musb *musb) 
 * @param power

 */



#define STAGE0_MASK (MUSB_INTR_RESUME | MUSB_INTR_SESSREQ \

		| MUSB_INTR_VBUSERROR | MUSB_INTR_CONNECT \

		| MUSB_INTR_RESET)



static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,

				u8 devctl, u8 power)

{
@@ -1598,7 +1594,7 @@ irqreturn_t musb_interrupt(struct musb *musb) 
	/* the core can interrupt us for multiple reasons; docs have

	 * a generic interrupt flowchart to follow

	 */

	if (musb->int_usb & STAGE0_MASK)

	if (musb->int_usb)

		retval |= musb_stage0_irq(musb, musb->int_usb,

				devctl, power);