Skip to content

Commit 67d6406

Browse files
committed
ALSA: usb-audio: Move generic implicit fb quirk entries into quirks.c
Use the new quirk bits to manage the generic implicit fb quirk entries. This makes easier to compare with other devices. Link: https://lore.kernel.org/r/20220421064101.12456-2-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 0f1f7a6 commit 67d6406

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

sound/usb/implicit.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ struct snd_usb_implicit_fb_match {
4545

4646
/* Implicit feedback quirk table for playback */
4747
static const struct snd_usb_implicit_fb_match playback_implicit_fb_quirks[] = {
48-
/* Generic matching */
49-
IMPLICIT_FB_GENERIC_DEV(0x0499, 0x1509), /* Steinberg UR22 */
50-
IMPLICIT_FB_GENERIC_DEV(0x0763, 0x2030), /* M-Audio Fast Track C400 */
51-
IMPLICIT_FB_GENERIC_DEV(0x0763, 0x2031), /* M-Audio Fast Track C600 */
52-
5348
/* Fixed EP */
5449
/* FIXME: check the availability of generic matching */
5550
IMPLICIT_FB_FIXED_DEV(0x0763, 0x2080, 0x81, 2), /* M-Audio FastTrack Ultra */

sound/usb/quirks.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
17931793
QUIRK_FLAG_CTL_MSG_DELAY_1M | QUIRK_FLAG_IGNORE_CTL_ERROR),
17941794
DEVICE_FLG(0x046d, 0x09a4, /* Logitech QuickCam E 3500 */
17951795
QUIRK_FLAG_CTL_MSG_DELAY_1M | QUIRK_FLAG_IGNORE_CTL_ERROR),
1796+
DEVICE_FLG(0x0499, 0x1509, /* Steinberg UR22 */
1797+
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
17961798
DEVICE_FLG(0x04d8, 0xfeea, /* Benchmark DAC1 Pre */
17971799
QUIRK_FLAG_GET_SAMPLE_RATE),
17981800
DEVICE_FLG(0x04e8, 0xa051, /* Samsung USBC Headset (AKG) */
@@ -1824,6 +1826,10 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
18241826
QUIRK_FLAG_IGNORE_CTL_ERROR),
18251827
DEVICE_FLG(0x074d, 0x3553, /* Outlaw RR2150 (Micronas UAC3553B) */
18261828
QUIRK_FLAG_GET_SAMPLE_RATE),
1829+
DEVICE_FLG(0x0763, 0x2030, /* M-Audio Fast Track C400 */
1830+
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
1831+
DEVICE_FLG(0x0763, 0x2031, /* M-Audio Fast Track C600 */
1832+
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
18271833
DEVICE_FLG(0x08bb, 0x2702, /* LineX FM Transmitter */
18281834
QUIRK_FLAG_IGNORE_CTL_ERROR),
18291835
DEVICE_FLG(0x0951, 0x16ad, /* Kingston HyperX */

0 commit comments

Comments
 (0)