From 7c365fb5e7ea83dd8b51563e23e21b47a79a2ce6 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Thu, 25 Dec 2008 17:15:09 +0300
Subject: [PATCH] --- yaml --- r: 131167 b: refs/heads/master c:
 ef84e4055f3561495c4c0e0dfb0b9f4a6e20479d h: refs/heads/master i:   131165:
 2d9e008c8c061d713e38ee6c445591a2ed1b4c67   131163:
 68f2fb8d04bad7a01bb5df2efadbb3718065084d   131159:
 3da185588cdad08e1a7afb38c2985a77dfca3512   131151:
 d42c880427d432e0f5a3939945429b5dcb1d392b   131135:
 d388d67bf479513b414b9bea80e65d1d2eae6ed6 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/gadget/fsl_qe_udc.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a8a0c549975f..a32245c924d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2247818a329687f30d1e5c3a62efc33d07c47522
+refs/heads/master: ef84e4055f3561495c4c0e0dfb0b9f4a6e20479d
diff --git a/trunk/drivers/usb/gadget/fsl_qe_udc.c b/trunk/drivers/usb/gadget/fsl_qe_udc.c
index 1319f8f7acba..7a820a3b4acd 100644
--- a/trunk/drivers/usb/gadget/fsl_qe_udc.c
+++ b/trunk/drivers/usb/gadget/fsl_qe_udc.c
@@ -2161,6 +2161,9 @@ static int reset_irq(struct qe_udc *udc)
 {
 	unsigned char i;
 
+	if (udc->usb_state == USB_STATE_DEFAULT)
+		return 0;
+
 	qe_usb_disable();
 	out_8(&udc->usb_regs->usb_usadr, 0);