diff options
author | Andreas Bergmeier <lcid-fire@gmx.net> | 2009-01-18 12:48:03 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-18 12:48:03 -0500 |
commit | 8693290b9038f32b6b9bafd97b7e18465d62655b (patch) | |
tree | 5fb4e0d46a44b8e6504957568a5f0a0e922d7c40 /sound/usb/usbmixer_maps.c | |
parent | d1a020050c6ce1a0794ff73582ccf47e4db536f7 (diff) |
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/usbmixer_maps.c')
-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[] = { | |||
261 | {} /* terminator */ | 261 | {} /* terminator */ |
262 | }; | 262 | }; |
263 | 263 | ||
264 | static struct usbmix_name_map scratch_live_map[] = { | ||
265 | /* 1: IT Line 1 (USB streaming) */ | ||
266 | /* 2: OT Line 1 (Speaker) */ | ||
267 | /* 3: IT Line 1 (Line connector) */ | ||
268 | { 4, "Line 1 In" }, /* FU */ | ||
269 | /* 5: OT Line 1 (USB streaming) */ | ||
270 | /* 6: IT Line 2 (USB streaming) */ | ||
271 | /* 7: OT Line 2 (Speaker) */ | ||
272 | /* 8: IT Line 2 (Line connector) */ | ||
273 | { 9, "Line 2 In" }, /* FU */ | ||
274 | /* 10: OT Line 2 (USB streaming) */ | ||
275 | /* 11: IT Mic (Line connector) */ | ||
276 | /* 12: OT Mic (USB streaming) */ | ||
277 | { 0 } /* terminator */ | ||
278 | }; | ||
279 | |||
264 | /* | 280 | /* |
265 | * Control map entries | 281 | * Control map entries |
266 | */ | 282 | */ |
@@ -316,6 +332,11 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { | |||
316 | .id = USB_ID(0x0ccd, 0x0028), | 332 | .id = USB_ID(0x0ccd, 0x0028), |
317 | .map = aureon_51_2_map, | 333 | .map = aureon_51_2_map, |
318 | }, | 334 | }, |
335 | { | ||
336 | .id = USB_ID(0x13e5, 0x0001), | ||
337 | .map = scratch_live_map, | ||
338 | .ignore_ctl_error = 1, | ||
339 | }, | ||
319 | { 0 } /* terminator */ | 340 | { 0 } /* terminator */ |
320 | }; | 341 | }; |
321 | 342 | ||