From: "Felipe F. Tonello" <eu@felipetonello.com>
To: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Felipe Balbi <balbi@ti.com>,
Clemens Ladisch <clemens@ladisch.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Robert Baldyga <r.baldyga@samsung.com>
Subject: [PATCH v6 1/3] usb: gadget: f_midi: set altsettings only for MIDIStreaming interface
Date: Tue, 1 Dec 2015 18:31:00 +0000 [thread overview]
Message-ID: <1448994662-21294-2-git-send-email-eu@felipetonello.com> (raw)
In-Reply-To: <1448994662-21294-1-git-send-email-eu@felipetonello.com>
This avoids duplication of USB requests for OUT endpoint and
re-enabling endpoints.
Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
---
drivers/usb/gadget/function/f_midi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index 29bfca1..e804231 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -75,6 +75,7 @@ struct f_midi {
struct usb_ep *in_ep, *out_ep;
struct snd_card *card;
struct snd_rawmidi *rmidi;
+ u8 ms_id;
struct snd_rawmidi_substream *in_substream[MAX_PORTS];
struct snd_rawmidi_substream *out_substream[MAX_PORTS];
@@ -321,8 +322,8 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
unsigned i;
int err;
- /* For Control Device interface we do nothing */
- if (intf == 0)
+ /* we only set alt for MIDIStreaming interface */
+ if (intf != midi->ms_id)
return 0;
err = f_midi_start_ep(midi, f, midi->in_ep);
@@ -730,6 +731,7 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f)
goto fail;
ms_interface_desc.bInterfaceNumber = status;
ac_header_desc.baInterfaceNr[0] = status;
+ midi->ms_id = status;
status = -ENODEV;
--
2.5.0
next prev parent reply other threads:[~2015-12-01 18:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-01 18:30 [PATCH v6 0/3] USB MIDI Gadget improvements and bug fixes Felipe F. Tonello
2015-12-01 18:31 ` Felipe F. Tonello [this message]
2015-12-01 18:31 ` [PATCH v6 2/3] usb: gadget: f_midi: fail if set_alt fails to allocate requests Felipe F. Tonello
2015-12-01 18:31 ` [PATCH v6 3/3] usb: gadget: f_midi: pre-allocate IN requests Felipe F. Tonello
2015-12-08 12:54 ` Felipe Ferreri Tonello
2015-12-11 17:04 ` [PATCH v6 0/3] USB MIDI Gadget improvements and bug fixes Felipe Ferreri Tonello
2015-12-16 16:03 ` Felipe Balbi
2015-12-17 11:40 ` Felipe Ferreri 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=1448994662-21294-2-git-send-email-eu@felipetonello.com \
--to=eu@felipetonello.com \
--cc=balbi@ti.com \
--cc=clemens@ladisch.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=r.baldyga@samsung.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®