From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Tue, 18 Jun 2013 03:43:29 +0000 (+0800)
Subject: usb: gadget: f_ncm: fix missing unlock on error in ncm_alloc()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c92834c19fc63f8a1d344eee0dd3d62c7b449e26;p=linux.git

usb: gadget: f_ncm: fix missing unlock on error in ncm_alloc()

Add the missing unlock before return from function ncm_alloc()
in the error handling case.

Introduced by commit e730660378be92b83288b59b824ccdace5cd2652.
(usb: gadget: f_ncm: add configfs support)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index 47a5724211cd3..952177f7eb9b4 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -1403,6 +1403,7 @@ struct usb_function *ncm_alloc(struct usb_function_instance *fi)
 				      sizeof(ncm->ethaddr));
 	if (status < 12) { /* strlen("01234567890a") */
 		kfree(ncm);
+		mutex_unlock(&opts->lock);
 		return ERR_PTR(-EINVAL);
 	}
 	ncm_string_defs[STRING_MAC_IDX].s = ncm->ethaddr;