mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Felipe F. Tonello" <eu@felipetonello.com>
To: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Felipe Balbi <balbi@kernel.org>,
	Michal Nazarewicz <mina86@mina86.com>
Subject: [PATCH v3 6/9] usb: gadget: f_midi: drop substreams when disabling endpoint
Date: Fri,  5 Aug 2016 19:34:58 +0100	[thread overview]
Message-ID: <20160805183501.11993-7-eu@felipetonello.com> (raw)
In-Reply-To: <20160805183501.11993-1-eu@felipetonello.com>

This change makes sure that the ALSA buffers are cleaned if an endpoint
becomes disabled.

Before this change, if the internal ALSA buffer did overflow, the MIDI
function would stop sending MIDI to the host.

Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
---
 drivers/usb/gadget/function/f_midi.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index 09d769e18b50..3a47596afcab 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -305,6 +305,19 @@ f_midi_complete(struct usb_ep *ep, struct usb_request *req)
 	}
 }
 
+static void f_midi_drop_out_substreams(struct f_midi *midi)
+{
+	unsigned int i;
+
+	for (i = 0; i < midi->in_ports; i++) {
+		struct gmidi_in_port *port = midi->in_ports_array + i;
+		struct snd_rawmidi_substream *substream = port->substream;
+
+		if (port->active && substream)
+			snd_rawmidi_drop_output(substream);
+	}
+}
+
 static int f_midi_start_ep(struct f_midi *midi,
 			   struct usb_function *f,
 			   struct usb_ep *ep)
@@ -402,6 +415,8 @@ static void f_midi_disable(struct usb_function *f)
 	/* release IN requests */
 	while (kfifo_get(&midi->in_req_fifo, &req))
 		free_ep_req(midi->in_ep, req);
+
+	f_midi_drop_out_substreams(midi);
 }
 
 static int f_midi_snd_free(struct snd_device *device)
@@ -571,18 +586,6 @@ static void f_midi_transmit_byte(struct usb_request *req,
 	port->state = next_state;
 }
 
-static void f_midi_drop_out_substreams(struct f_midi *midi)
-{
-	unsigned int i;
-
-	for (i = 0; i < midi->in_ports; i++) {
-		struct gmidi_in_port *port = midi->in_ports_array + i;
-		struct snd_rawmidi_substream *substream = port->substream;
-		if (port->active && substream)
-			snd_rawmidi_drop_output(substream);
-	}
-}
-
 static int f_midi_do_transmit(struct f_midi *midi, struct usb_ep *ep)
 {
 	struct usb_request *req = NULL;
-- 
2.9.0

  parent reply	other threads:[~2016-08-05 18:39 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-05 18:34 [PATCH v3 0/9] Gadget endpoint request allocation and MIDI Felipe F. Tonello
2016-08-05 18:34 ` [PATCH v3 1/9] usb: gadget: fix usb_ep_align_maybe endianness and new usb_ep_align Felipe F. Tonello
2016-08-06  2:03   ` Michal Nazarewicz
2016-08-05 18:34 ` [PATCH v3 2/9] usb: gadget: align buffer size when allocating for OUT endpoint Felipe F. Tonello
2016-08-05 19:15   ` kbuild test robot
2016-08-08 17:09     ` Felipe Ferreri Tonello
2016-08-05 18:34 ` [PATCH v3 3/9] usb: gadget: f_midi: remove alignment code " Felipe F. Tonello
2016-08-05 18:34 ` [PATCH v3 4/9] usb: gadget: f_midi: defaults buflen sizes to 512 Felipe F. Tonello
2016-08-06  2:04   ` Michal Nazarewicz
2016-08-05 18:34 ` [PATCH v3 5/9] usb: gadget: f_midi: refactor state machine Felipe F. Tonello
2016-08-05 18:34 ` Felipe F. Tonello [this message]
2016-08-05 18:34 ` [PATCH v3 7/9] usb: gadget: remove useless parameter in alloc_ep_req() Felipe F. Tonello
2016-08-05 18:35 ` [PATCH v3 8/9] usb: gadget: f_hid: use free_ep_req() Felipe F. Tonello
2016-08-05 18:35 ` [PATCH v3 9/9] usb: gadget: f_hid: use alloc_ep_req() Felipe F. Tonello

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=20160805183501.11993-7-eu@felipetonello.com \
    --to=eu@felipetonello.com \
    --cc=balbi@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mina86@mina86.com \
    /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®