diff options
| author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2014-10-16 13:33:25 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-11-05 13:36:02 -0600 |
| commit | 6e58ed578e2c65442b7a02deecc96e482c701654 (patch) | |
| tree | ffe84c23114f7c6829a0bb8f64d37ce9b1cf8bca | |
| parent | cb0a59f541337e646fcea15628eb46866fedb8a3 (diff) | |
| download | blackbird-op-linux-6e58ed578e2c65442b7a02deecc96e482c701654.tar.gz blackbird-op-linux-6e58ed578e2c65442b7a02deecc96e482c701654.zip | |
usb: gadget: f_midi: enable use of the index parameter
The soundcard index to use for the ALSA device creation is passed as a
parameter to f_midi_bind_config(), but is assigned to midi->index only
after the call to f_midi_register_card(midi). So no matter what is passed
to f_midi_bind_config(), the actual index for snd_card_new() is always 0.
This probably works ok if at the moment of f_midi's bind there are no
other snd_cards, but if there are, it is not possible to bind f_midi.
This patch moves the assignment to a place before the call to
f_midi_register_card(midi).
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/function/f_midi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c index 807b31c0edc3..bf329578c957 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -954,6 +954,7 @@ int __init f_midi_bind_config(struct usb_configuration *c, /* set up ALSA midi devices */ midi->in_ports = in_ports; midi->out_ports = out_ports; + midi->index = index; status = f_midi_register_card(midi); if (status < 0) goto setup_fail; @@ -966,7 +967,6 @@ int __init f_midi_bind_config(struct usb_configuration *c, midi->func.disable = f_midi_disable; midi->id = kstrdup(id, GFP_KERNEL); - midi->index = index; midi->buflen = buflen; midi->qlen = qlen; |
