From df9e3b068fc312128305456fbe32aa79894ca91a Mon Sep 17 00:00:00 2001
From: Neil Zhang <zhangwm@marvell.com>
Date: Wed, 30 Nov 2011 09:57:14 +0800
Subject: [PATCH] --- yaml --- r: 280888 b: refs/heads/master c:
 309d6d2be42c895c424a5090fcc2e95ce2d8499a h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/gadget/mv_udc.h      | 3 ++-
 trunk/drivers/usb/gadget/mv_udc_core.c | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 11ad0efe52b3..5ac44cf092fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 487d54d172b3afd3d2bf124b24eaf7f7e7b8a668
+refs/heads/master: 309d6d2be42c895c424a5090fcc2e95ce2d8499a
diff --git a/trunk/drivers/usb/gadget/mv_udc.h b/trunk/drivers/usb/gadget/mv_udc.h
index b2c36ee3c82c..3d8404484613 100644
--- a/trunk/drivers/usb/gadget/mv_udc.h
+++ b/trunk/drivers/usb/gadget/mv_udc.h
@@ -211,7 +211,8 @@ struct mv_udc {
 				softconnected:1,
 				force_fs:1,
 				clock_gating:1,
-				active:1;
+				active:1,
+				stopped:1;      /* stop bit is setted */
 
 	struct work_struct	vbus_work;
 	struct workqueue_struct *qwork;
diff --git a/trunk/drivers/usb/gadget/mv_udc_core.c b/trunk/drivers/usb/gadget/mv_udc_core.c
index 647cc3ab1709..6ff0b6b238ac 100644
--- a/trunk/drivers/usb/gadget/mv_udc_core.c
+++ b/trunk/drivers/usb/gadget/mv_udc_core.c
@@ -1056,6 +1056,8 @@ static void udc_stop(struct mv_udc *udc)
 		USBINTR_PORT_CHANGE_DETECT_EN | USBINTR_RESET_EN);
 	writel(tmp, &udc->op_regs->usbintr);
 
+	udc->stopped = 1;
+
 	/* Reset the Run the bit in the command register to stop VUSB */
 	tmp = readl(&udc->op_regs->usbcmd);
 	tmp &= ~USBCMD_RUN_STOP;
@@ -1072,6 +1074,8 @@ static void udc_start(struct mv_udc *udc)
 	/* Enable interrupts */
 	writel(usbintr, &udc->op_regs->usbintr);
 
+	udc->stopped = 0;
+
 	/* Set the Run bit in the command register */
 	writel(USBCMD_RUN_STOP, &udc->op_regs->usbcmd);
 }
@@ -2040,6 +2044,10 @@ static irqreturn_t mv_udc_irq(int irq, void *dev)
 	struct mv_udc *udc = (struct mv_udc *)dev;
 	u32 status, intr;
 
+	/* Disable ISR when stopped bit is set */
+	if (udc->stopped)
+		return IRQ_NONE;
+
 	spin_lock(&udc->lock);
 
 	status = readl(&udc->op_regs->usbsts);