From d7bc4ac0dd756064dd12dd2c404bfeb82224ac56 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Wed, 14 Nov 2012 13:47:23 +0800
Subject: [PATCH] --- yaml --- r: 348674 b: refs/heads/master c:
 5dbd693576726bd7d3228ee614060e0817305dde h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0b06fad1e364..d0b8cc63af89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25e14c1fcce5c66b0d2d5e35fad35d044dc320ae
+refs/heads/master: 5dbd693576726bd7d3228ee614060e0817305dde
diff --git a/trunk/drivers/usb/gadget/tcm_usb_gadget.c b/trunk/drivers/usb/gadget/tcm_usb_gadget.c
index 4f7f76f00c74..7cacd6ae818e 100644
--- a/trunk/drivers/usb/gadget/tcm_usb_gadget.c
+++ b/trunk/drivers/usb/gadget/tcm_usb_gadget.c
@@ -1794,9 +1794,10 @@ static int tcm_usbg_drop_nexus(struct usbg_tpg *tpg)
 	tpg->tpg_nexus = NULL;
 
 	kfree(tv_nexus);
+	ret = 0;
 out:
 	mutex_unlock(&tpg->tpg_mutex);
-	return 0;
+	return ret;
 }
 
 static ssize_t tcm_usbg_tpg_store_nexus(