aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@nokia.com>2010-10-29 04:23:27 -0500
committerFelipe Balbi <balbi@ti.com>2010-11-05 14:17:35 +0200
commit19aab56c7f68a577d638a98c019b89420943ee70 (patch)
treee2b3d88abd4bcf37501260cb38323cf8a5dcd2a2 /drivers/usb
parentusb: musb: fix kernel oops when loading musb_hdrc module for the 2nd time (diff)
downloadlinux-dev-19aab56c7f68a577d638a98c019b89420943ee70.tar.xz
linux-dev-19aab56c7f68a577d638a98c019b89420943ee70.zip
usb: musb: Fix handling of spurious SESSREQ
Rely on VBUS being valid on top off B device. Signed-off-by: Heikki Krogerus <heikki.krogerus@nokia.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/musb/musb_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 78277170275b..e6669fc3b804 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -552,7 +552,8 @@ 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) {
+ if ((devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS
+ && (devctl & MUSB_DEVCTL_BDEVICE)) {
DBG(3, "SessReq while on B state\n");
return IRQ_HANDLED;
}