From: "Felipe F. Tonello" <eu@felipetonello.com>
To: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Peter Chen <Peter.Chen@freescale.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Felipe Balbi <balbi@ti.com>,
Andrzej Pietrasiewicz <andrzej.p@samsung.com>,
"Felipe F. Tonello" <eu@felipetonello.com>
Subject: [PATCH v3 3/4] usb: gadget: f_midi: Transmit data only when IN ep is enabled
Date: Tue, 29 Sep 2015 13:01:58 +0100 [thread overview]
Message-ID: <1443528119-31830-4-git-send-email-eu@felipetonello.com> (raw)
In-Reply-To: <1443528119-31830-1-git-send-email-eu@felipetonello.com>
This makes sure f_midi doesn't try to enqueue data when the IN endpoint is
disabled, ie, USB cable is disconnected.
Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
---
drivers/usb/gadget/function/f_midi.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index 163c0ce..bbfe43b 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -87,6 +87,7 @@ struct f_midi {
int index;
char *id;
unsigned int buflen, qlen;
+ bool in_ep_enabled;
};
static inline struct f_midi *func_to_midi(struct usb_function *f)
@@ -331,6 +332,7 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
err = f_midi_start_ep(midi, f, midi->in_ep);
if (err)
return err;
+ midi->in_ep_enabled = true;
err = f_midi_start_ep(midi, f, midi->out_ep);
if (err)
@@ -386,6 +388,8 @@ static void f_midi_disable(struct usb_function *f)
*/
usb_ep_disable(midi->in_ep);
usb_ep_disable(midi->out_ep);
+
+ midi->in_ep_enabled = false;
}
static int f_midi_snd_free(struct snd_device *device)
@@ -542,7 +546,7 @@ static void f_midi_transmit(struct f_midi *midi, struct usb_request *req)
}
}
- if (req->length > 0) {
+ if (req->length > 0 && midi->in_ep_enabled) {
int err;
err = usb_ep_queue(ep, req, GFP_ATOMIC);
@@ -1159,6 +1163,7 @@ static struct usb_function *f_midi_alloc(struct usb_function_instance *fi)
midi->index = opts->index;
midi->buflen = opts->buflen;
midi->qlen = opts->qlen;
+ midi->in_ep_enabled = false;
++opts->refcnt;
mutex_unlock(&opts->lock);
--
2.1.4
next prev parent reply other threads:[~2015-09-29 12:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-29 12:01 [PATCH v3 0/4] USB MIDI Gadget bug fixes and improvements Felipe F. Tonello
2015-09-29 12:01 ` [PATCH v3 1/4] usb: gadget: f_midi: free usb request when done Felipe F. Tonello
2015-09-29 12:01 ` [PATCH v3 2/4] usb: gadget: f_midi: free request when usb_ep_queue fails Felipe F. Tonello
2015-09-29 12:01 ` Felipe F. Tonello [this message]
2015-09-29 12:01 ` [PATCH v3 4/4] usb: gadget: f_midi: remove duplicated code Felipe F. Tonello
2015-10-08 8:36 ` [PATCH v3 0/4] USB MIDI Gadget bug fixes and improvements Felipe Tonello
2015-10-09 9:23 ` [PATCH v3 1/4] usb: gadget: f_midi: free usb request when done Clemens Ladisch
2015-10-09 20:55 ` Felipe Balbi
2015-10-11 19:08 ` Clemens Ladisch
2015-10-12 10:11 ` Felipe Tonello
2015-10-12 9:46 ` Felipe Tonello
2015-10-12 10:16 ` Clemens Ladisch
2015-10-12 11:58 ` Felipe Tonello
2015-10-12 12:10 ` Clemens Ladisch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443528119-31830-4-git-send-email-eu@felipetonello.com \
--to=eu@felipetonello.com \
--cc=Peter.Chen@freescale.com \
--cc=andrzej.p@samsung.com \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®