Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8693290b9038f32b6b9bafd97b7e18465d62655b

Authored by Andreas Bergmeier
Committed by Takashi Iwai
1 parent d1a020050c
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 1 changed file with 21 additions and 0 deletions Side-by-side Diff

sound/usb/usbmixer_maps.c
Diff comments   View file @ 8693290
... ... @@ -261,6 +261,22 @@
261 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 281 * Control map entries
266 282 */
... ... @@ -315,6 +331,11 @@
315 331 {
316 332 .id = USB_ID(0x0ccd, 0x0028),
317 333 .map = aureon_51_2_map,
  334 + },
  335 + {
  336 + .id = USB_ID(0x13e5, 0x0001),
  337 + .map = scratch_live_map,
  338 + .ignore_ctl_error = 1,
318 339 },
319 340 { 0 } /* terminator */
320 341 };