From 3e5c2e8eb64e3eb4d16465b95255e068ef8121d5 Mon Sep 17 00:00:00 2001
From: Sven Schnelle <svens@stackframe.org>
Date: Wed, 23 Mar 2011 21:36:17 +0100
Subject: [PATCH] --- yaml --- r: 248744 b: refs/heads/master c:
 1744020ceb86c83d8116d28c7bdd221d071ca213 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/gadget/dbgp.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 63abdc94fab0..c895e5d979c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25a73c6ce7f3b7b667a11a116d9607d6d5bf5cab
+refs/heads/master: 1744020ceb86c83d8116d28c7bdd221d071ca213
diff --git a/trunk/drivers/usb/gadget/dbgp.c b/trunk/drivers/usb/gadget/dbgp.c
index e5ac8a316fec..2932b48da0f9 100644
--- a/trunk/drivers/usb/gadget/dbgp.c
+++ b/trunk/drivers/usb/gadget/dbgp.c
@@ -350,9 +350,9 @@ static int dbgp_setup(struct usb_gadget *gadget,
 	u8 request = ctrl->bRequest;
 	u16 value = le16_to_cpu(ctrl->wValue);
 	u16 length = le16_to_cpu(ctrl->wLength);
-	int err = 0;
-	void *data;
-	u16 len;
+	int err = -EOPNOTSUPP;
+	void *data = NULL;
+	u16 len = 0;
 
 	gadget->ep0->driver_data = gadget;
 
@@ -371,10 +371,9 @@ static int dbgp_setup(struct usb_gadget *gadget,
 		default:
 			goto fail;
 		}
+		err = 0;
 	} else if (request == USB_REQ_SET_FEATURE &&
 		   value == USB_DEVICE_DEBUG_MODE) {
-		len = 0;
-		data = NULL;
 		dev_dbg(&dbgp.gadget->dev, "setup: feat debug\n");
 #ifdef CONFIG_USB_G_DBGP_PRINTK
 		err = dbgp_enable_ep();