aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-03-30 16:22:01 +0200
committerJaroslav Kysela <perex@suse.cz>2005-05-29 09:00:53 +0200
commitc1ab5d59a0ff0981828a169886b10045dfdf64c6 (patch)
tree8ce9f8cd0b534b55f0c99556fd1a96727596cbf9
parent85a655d66b4d1672c7c6fee31297837556585f6b (diff)
downloadkernel_samsung_aries-c1ab5d59a0ff0981828a169886b10045dfdf64c6.zip
kernel_samsung_aries-c1ab5d59a0ff0981828a169886b10045dfdf64c6.tar.gz
kernel_samsung_aries-c1ab5d59a0ff0981828a169886b10045dfdf64c6.tar.bz2
[ALSA] usb-audio - allow USB MIDI quirks to specify endpoints explicitly
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>
-rw-r--r--sound/usb/usbmidi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 5d32857..600d990 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -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;