aboutsummaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-10 09:56:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-10 09:56:10 -0700
commit4263a2f1dad8c8e7ce2352a0cbc882c2b0c044a9 (patch)
treee5892af7a7fd7784c5a3dba682b3cc2728ecadcf /sound/usb
parent510ec7bc3bf6bc6d87662d16a6136135d747e535 (diff)
parent84f3b6dab973c1a9e941fdd1a55caa44da6d9882 (diff)
downloadlinux-linaro-precise-4263a2f1dad8c8e7ce2352a0cbc882c2b0c044a9.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Don't query connections for widgets have no connections ALSA: HDA: Fix single internal mic on ALC275 (Sony Vaio VPCSB1C5E) ALSA: hda - HDMI: Fix MCP7x audio infoframe checksums ALSA: usb-audio: define another USB ID for a buggy USB MIDI cable ALSA: HDA: Fix dock mic for Lenovo X220-tablet ASoC: format_register_str: Don't clip register values ASoC: PXA: Fix oops in __pxa2xx_pcm_prepare ASoC: zylonite: set .codec_dai_name in initializer
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/midi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index b4b39c0b6c9..f9289102886 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -1301,6 +1301,7 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
case USB_ID(0x15ca, 0x0101): /* Textech USB Midi Cable */
case USB_ID(0x15ca, 0x1806): /* Textech USB Midi Cable */
case USB_ID(0x1a86, 0x752d): /* QinHeng CH345 "USB2.0-MIDI" */
+ case USB_ID(0xfc08, 0x0101): /* Unknown vendor Cable */
ep->max_transfer = 4;
break;
/*