dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'usb-midi-fix-3.7' of git://git.alsa-project.org/alsa-kprivate into for-linus 

Merge a regression fix for USB MIDI on non-standard usb-audio drivers
by Clemens.
This commit is contained in:
Takashi Iwai 2012-11-19 09:55:06 +01:00
parent 10e44239f6 e99ddfde6a
commit 0ced14fbda
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/usb/midi.c
View File

@ -148,6 +148,7 @@ struct snd_usb_midi_out_endpoint {
struct snd_usb_midi_out_endpoint* ep;
struct snd_rawmidi_substream *substream;
int active;
bool autopm_reference;
uint8_t cable; /* cable number << 4 */
uint8_t state;
#define STATE_UNKNOWN 0
@ -1076,7 +1077,8 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
return -ENXIO;
}
err = usb_autopm_get_interface(umidi->iface);
if (err < 0)
port->autopm_reference = err >= 0;
if (err < 0 && err != -EACCES)
return -EIO;
substream->runtime->private_data = port;
port->state = STATE_UNKNOWN;
@ -1087,9 +1089,11 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
static int snd_usbmidi_output_close(struct snd_rawmidi_substream *substream)
{
struct snd_usb_midi* umidi = substream->rmidi->private_data;
struct usbmidi_out_port *port = substream->runtime->private_data;
substream_open(substream, 0);
usb_autopm_put_interface(umidi->iface);
if (port->autopm_reference)
usb_autopm_put_interface(umidi->iface);
return 0;
}