Return-Path: Message-Id: <20130703184056.615894208@goodmis.org> Date: Wed, 03 Jul 2013 14:40:09 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Clemens Ladisch , Takashi Iwai Subject: [072/141] ALSA: usb-audio: fix Roland/Cakewalk UM-3G support References: <20130703183857.307196999@goodmis.org> Content-Disposition: inline; filename=0072-ALSA-usb-audio-fix-Roland-Cakewalk-UM-3G-support.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.6 stable review patch. If anyone has any objections, please let me know. ------------------ From: Clemens Ladisch [ Upstream commit a0c6d309c6df14655f9962f666d1da96318b0b7c ] Commit 927c9423dd5f2d1c0b93d5e694ab84b4a5559713 (ALSA: usb-audio: add Edirol UM-3G support) used a wrong quirk type, which would make the driver refuse to attach with the error message "MIDIStreaming interface descriptor not found". Cc: # 3.3 and later Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai Signed-off-by: Steven Rostedt --- sound/usb/quirks-table.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index d73ac9b..0f7c933 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1622,7 +1622,11 @@ YAMAHA_DEVICE(0x7010, "UB99"), USB_DEVICE_VENDOR_SPEC(0x0582, 0x0108), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { .ifnum = 0, - .type = QUIRK_MIDI_STANDARD_INTERFACE + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = & (const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0007, + .in_cables = 0x0007 + } } }, { -- 1.7.10.4