aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-03-30 09:22:01 -0500
committerJaroslav Kysela <perex@suse.cz>2005-05-29 03:00:53 -0400
commitc1ab5d59a0ff0981828a169886b10045dfdf64c6 (patch)
tree8ce9f8cd0b534b55f0c99556fd1a96727596cbf9
parent85a655d66b4d1672c7c6fee31297837556585f6b (diff)
[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 5d32857ff955..600d990ddc90 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,
1229 if (le16_to_cpu(umidi->chip->dev->descriptor.idVendor) == 0x0582) 1229 if (le16_to_cpu(umidi->chip->dev->descriptor.idVendor) == 0x0582)
1230 snd_usbmidi_switch_roland_altsetting(umidi); 1230 snd_usbmidi_switch_roland_altsetting(umidi);
1231 1231
1232 if (endpoint[0].out_ep || endpoint[0].in_ep)
1233 return 0;
1234
1232 intf = umidi->iface; 1235 intf = umidi->iface;
1233 if (!intf || intf->num_altsetting < 1) 1236 if (!intf || intf->num_altsetting < 1)
1234 return -ENOENT; 1237 return -ENOENT;