From 9d16026ee214eab9d3bcaf55286b6214f12afa12 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sat, 6 Apr 2013 17:23:22 +0800
Subject: [PATCH] --- yaml --- r: 364883 b: refs/heads/master c:
 ad46047bd1988d61bc53ea354b77ef40f8a674a5 h: refs/heads/master i:   364881:
 4235c50844a8dc36f99a1b591ed37b73a15bf643   364879:
 05e1e39d936f9aa986a835ef634f95c9f48a5b87 v: v3

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

diff --git a/[refs] b/[refs]
index d5976eefa7cc..83113ec2e430 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ee3e8e63d77bb4ed686f0c92dc7aa1a8e13fefb
+refs/heads/master: ad46047bd1988d61bc53ea354b77ef40f8a674a5
diff --git a/trunk/drivers/usb/gadget/multi.c b/trunk/drivers/usb/gadget/multi.c
index a74ebefc7682..4a45e80c6e38 100644
--- a/trunk/drivers/usb/gadget/multi.c
+++ b/trunk/drivers/usb/gadget/multi.c
@@ -157,8 +157,10 @@ static __init int rndis_do_config(struct usb_configuration *c)
 		return ret;
 
 	f_acm_rndis = usb_get_function(fi_acm);
-	if (IS_ERR(f_acm_rndis))
+	if (IS_ERR(f_acm_rndis)) {
+		ret = PTR_ERR(f_acm_rndis);
 		goto err_func_acm;
+	}
 
 	ret = usb_add_function(c, f_acm_rndis);
 	if (ret)