]> err.no Git - linux-2.6/commitdiff
[ALSA] usb-audio - allow USB MIDI quirks to specify endpoints explicitly
authorClemens Ladisch <clemens@ladisch.de>
Wed, 30 Mar 2005 14:22:01 +0000 (16:22 +0200)
committerJaroslav Kysela <perex@suse.cz>
Sun, 29 May 2005 07:00:53 +0000 (09:00 +0200)
USB generic driver
This patch reintroduces the check for endpoint numbers that are
specified explicitly in the quirk structure.
This check was accidentally dropped in the last rewrite of
snd_usbmidi_detect_endpoints().

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
sound/usb/usbmidi.c

index 5d32857ff9554b0c4d7b8c9dbc037f67b241508d..600d990ddc90e43c8a0d728f514d675a07a27df1 100644 (file)
@@ -1229,6 +1229,9 @@ static int snd_usbmidi_detect_endpoints(snd_usb_midi_t* umidi,
        if (le16_to_cpu(umidi->chip->dev->descriptor.idVendor) == 0x0582)
                snd_usbmidi_switch_roland_altsetting(umidi);
 
+       if (endpoint[0].out_ep || endpoint[0].in_ep)
+               return 0;       
+
        intf = umidi->iface;
        if (!intf || intf->num_altsetting < 1)
                return -ENOENT;