Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1299461
| Path | csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | "Felipe F. Tonello" <eu@felipetonello.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 4/4] usb: gadget: f_midi: add mutex_unlock under setup_fail label |
| Date | Wed, 30 Dec 2015 20:10:03 +0100 |
| Message-ID | <qLuif-2ad-45@gated-at.bofh.it> (permalink) |
| References | <qLuie-2ad-3@gated-at.bofh.it> |
| X-Original-To | linux-usb@vger.kernel.org |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=felipetonello-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ed3Ja1of44f4/o6YaugC0atDqjPryBkBne4cQrmGPL4=; b=BGtBu4AIaQhM/rb3FgizEOIFlvOK3pDeZM5BVjVM1WRdtANWHfPtRyVJVEU9yRe1KI RWz19dFQxFf5FgxYgzvT+PXW9Be8wvV3ojkK1nTC+ff8Cxyw0Ep8iWDf4CO4L6pP+CV5 PsTBA+NkZnjYujgaMJGAYNk1TsEr6G3bkJXrZC2Su4Bog2/KgLXO1D8dhBlK4r98bQW0 8Ro0WN9PVEMP+jRMnhbOXwziZWtfzZXrgYgPe/nr0j1xgcv81pm5OS7u92V9FlBjtIAZ 3HTjyMOuFfeUrcjeBxt4T9xSR6zCl0Qj5Q1UtpTkdvqTglgVRXHCU2sydIKdvEJQgjh/ dWgg== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ed3Ja1of44f4/o6YaugC0atDqjPryBkBne4cQrmGPL4=; b=atu47d99n7f/WgCFgAqt1bqnGvAKaWTpyTZz/L7ylh3GZ6XmccI3W6inF44P5ubaqE lusceGIMIf5VlQw33qMGb1YeFNtUrpn/xLxXwnjKCqjty8YcoTnrxaqZXLi3hx2vczkF xKsE0Dw07OXWw66rvMqpxH6mdbFr4mwCT9SPSuu0q38twH3fuUpoaY+gRC8m9Ka6aZgi v/bzcUUxJdejRBAgZnkQnvBfPu8SkNLy3LavQ0dsumiD/DSOH03Dord6k1e5Revo4clG 95BfuTGaIbuTb5oMv/BPdBAvzEPjjUyAGDIdhb8S2N2q0+mjoYbV6kIicLX/6nXq8odR RNHA== |
| X-Gm-Message-State | ALoCoQkeEip4Cr5/Y5Nm9YPBcjOfnD0RhQ9jPfLMyfZ+e9U9nPjAxR+0t7LmR864iXSpcMapobcr12UbqYZaTS5Cn2HGD6+3iA== |
| X-Received | by 10.194.110.230 with SMTP id id6mr67460675wjb.67.1451502471049; Wed, 30 Dec 2015 11:07:51 -0800 (PST) |
| X-Mailer | git-send-email 2.6.4 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 44 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-kernel@vger.kernel.org, Felipe Balbi <balbi@ti.com>, Robert Baldyga <r.baldyga@samsung.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Clemens Ladisch <clemens@ladisch.de> |
| X-Original-Date | Wed, 30 Dec 2015 19:07:55 +0000 |
| X-Original-Message-ID | <1451502475-22794-5-git-send-email-eu@felipetonello.com> |
| X-Original-References | <1451502475-22794-1-git-send-email-eu@felipetonello.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1299461 |
Show key headers only | View raw
This ensures that at any point on the function if a goto to setup_fail is
made, it will unlock the mutex.
Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
---
drivers/usb/gadget/function/f_midi.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index b7d3f5a10bf0..1255f8a898d0 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -1251,7 +1251,6 @@ static struct usb_function *f_midi_alloc(struct usb_function_instance *fi)
if (!port) {
status = -ENOMEM;
- mutex_unlock(&opts->lock);
goto setup_fail;
}
@@ -1264,7 +1263,6 @@ static struct usb_function *f_midi_alloc(struct usb_function_instance *fi)
midi->id = kstrdup(opts->id, GFP_KERNEL);
if (opts->id && !midi->id) {
status = -ENOMEM;
- mutex_unlock(&opts->lock);
goto setup_fail;
}
midi->in_ports = opts->in_ports;
@@ -1293,6 +1291,7 @@ static struct usb_function *f_midi_alloc(struct usb_function_instance *fi)
return &midi->func;
setup_fail:
+ mutex_unlock(&opts->lock);
for (--i; i >= 0; i--)
kfree(midi->in_port[i]);
kfree(midi);
--
2.6.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH 0/4] More improvements on MIDI gadget function "Felipe F. Tonello" <eu@felipetonello.com> - 2015-12-30 20:10 +0100 [PATCH 2/4] usb: gadget: f_midi: added spinlock on transmit function "Felipe F. Tonello" <eu@felipetonello.com> - 2015-12-30 20:10 +0100 [PATCH 1/4] usb: gadget: f_midi: refactor state machine "Felipe F. Tonello" <eu@felipetonello.com> - 2015-12-30 20:10 +0100 [PATCH 3/4] usb: gadget: f_midi: remove useless midi reference from port struct "Felipe F. Tonello" <eu@felipetonello.com> - 2015-12-30 20:10 +0100 [PATCH 4/4] usb: gadget: f_midi: add mutex_unlock under setup_fail label "Felipe F. Tonello" <eu@felipetonello.com> - 2015-12-30 20:10 +0100
csiph-web