From 96de57ceaa6e958461f8e1aa81d7879d5d9baaad Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Fri, 24 Sep 2010 13:44:13 +0300 Subject: [PATCH] --- yaml --- r: 213601 b: refs/heads/master c: a6038ee76a29ea31f8aae4eb6c419794c739e077 h: refs/heads/master i: 213599: 92cc6c7a0bb75358e90c702ebd986cffd52674a3 v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/musb_core.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 02b2ea348c63..e181ab979c62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 434678685407e045ffb246df059c486fc0a16e75 +refs/heads/master: a6038ee76a29ea31f8aae4eb6c419794c739e077 diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c index d4f18bbc8f8f..472b2a7e7896 100644 --- a/trunk/drivers/usb/musb/musb_core.c +++ b/trunk/drivers/usb/musb/musb_core.c @@ -550,6 +550,11 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, if (int_usb & MUSB_INTR_SESSREQ) { void __iomem *mbase = musb->mregs; + if (devctl & MUSB_DEVCTL_BDEVICE) { + DBG(3, "SessReq while on B state\n"); + return IRQ_HANDLED; + } + DBG(1, "SESSION_REQUEST (%s)\n", otg_state_string(musb)); /* IRQ arrives from ID pin sense or (later, if VBUS power