From 83900eefafe5408b1995ed4b4a1bb3c8bfa26bc5 Mon Sep 17 00:00:00 2001
From: Heikki Krogerus <heikki.krogerus@nokia.com>
Date: Fri, 29 Oct 2010 04:23:27 -0500
Subject: [PATCH] --- yaml --- r: 221928 b: refs/heads/master c:
 19aab56c7f68a577d638a98c019b89420943ee70 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/musb/musb_core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 242a7e5e970f..2bb31b652f91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b212091474a5f967979e62c5c24687ee4d0342d9
+refs/heads/master: 19aab56c7f68a577d638a98c019b89420943ee70
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
index 78277170275b..e6669fc3b804 100644
--- a/trunk/drivers/usb/musb/musb_core.c
+++ b/trunk/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;
 		}