diff options
| author | Andreas Bergmeier <lcid-fire@gmx.net> | 2009-01-18 18:48:03 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-18 18:48:03 +0100 |
| commit | 8693290b9038f32b6b9bafd97b7e18465d62655b (patch) | |
| tree | 5fb4e0d46a44b8e6504957568a5f0a0e922d7c40 /sound/usb | |
| parent | Merge branch 'topic/usb-mixer-cache' into next/usb-audio (diff) | |
| download | linux-8693290b9038f32b6b9bafd97b7e18465d62655b.tar.xz linux-8693290b9038f32b6b9bafd97b7e18465d62655b.zip | |
ALSA: usb-audio - Quirk for Serato phono
Ignore errors (wrong usb interface data) found when using the serato
scratch live box with alsa
Thus the alsa controls can be accessed (beware: they don't work though -
but at least it's one ugly error message less)
Signed-off-by: Andreas Bergmeier <lcid-fire@gmx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/usbmixer_maps.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c index f41214f3ad6b..3e5d66cf1f5a 100644 --- a/sound/usb/usbmixer_maps.c +++ b/sound/usb/usbmixer_maps.c @@ -261,6 +261,22 @@ static struct usbmix_name_map aureon_51_2_map[] = { {} /* terminator */ }; +static struct usbmix_name_map scratch_live_map[] = { + /* 1: IT Line 1 (USB streaming) */ + /* 2: OT Line 1 (Speaker) */ + /* 3: IT Line 1 (Line connector) */ + { 4, "Line 1 In" }, /* FU */ + /* 5: OT Line 1 (USB streaming) */ + /* 6: IT Line 2 (USB streaming) */ + /* 7: OT Line 2 (Speaker) */ + /* 8: IT Line 2 (Line connector) */ + { 9, "Line 2 In" }, /* FU */ + /* 10: OT Line 2 (USB streaming) */ + /* 11: IT Mic (Line connector) */ + /* 12: OT Mic (USB streaming) */ + { 0 } /* terminator */ +}; + /* * Control map entries */ @@ -316,6 +332,11 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .id = USB_ID(0x0ccd, 0x0028), .map = aureon_51_2_map, }, + { + .id = USB_ID(0x13e5, 0x0001), + .map = scratch_live_map, + .ignore_ctl_error = 1, + }, { 0 } /* terminator */ }; |