lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 224/879] ALSA: usb-audio: Move generic implicit fb quirk entries into quirks.c
    Date
    From: Takashi Iwai <tiwai@suse.de>

    [ Upstream commit 67d64069bc0867e52e73a1e255b17462005ca9b4 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/usb/implicit.c | 5 -----
    sound/usb/quirks.c | 6 ++++++
    2 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/sound/usb/implicit.c b/sound/usb/implicit.c
    index 1fd087128538..e1bf1b5da423 100644
    --- a/sound/usb/implicit.c
    +++ b/sound/usb/implicit.c
    @@ -45,11 +45,6 @@ struct snd_usb_implicit_fb_match {

    /* Implicit feedback quirk table for playback */
    static const struct snd_usb_implicit_fb_match playback_implicit_fb_quirks[] = {
    - /* Generic matching */
    - IMPLICIT_FB_GENERIC_DEV(0x0499, 0x1509), /* Steinberg UR22 */
    - IMPLICIT_FB_GENERIC_DEV(0x0763, 0x2030), /* M-Audio Fast Track C400 */
    - IMPLICIT_FB_GENERIC_DEV(0x0763, 0x2031), /* M-Audio Fast Track C600 */
    -
    /* Fixed EP */
    /* FIXME: check the availability of generic matching */
    IMPLICIT_FB_FIXED_DEV(0x0763, 0x2080, 0x81, 2), /* M-Audio FastTrack Ultra */
    diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
    index fbbe59054c3f..e8468f9b007d 100644
    --- a/sound/usb/quirks.c
    +++ b/sound/usb/quirks.c
    @@ -1793,6 +1793,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
    QUIRK_FLAG_CTL_MSG_DELAY_1M | QUIRK_FLAG_IGNORE_CTL_ERROR),
    DEVICE_FLG(0x046d, 0x09a4, /* Logitech QuickCam E 3500 */
    QUIRK_FLAG_CTL_MSG_DELAY_1M | QUIRK_FLAG_IGNORE_CTL_ERROR),
    + DEVICE_FLG(0x0499, 0x1509, /* Steinberg UR22 */
    + QUIRK_FLAG_GENERIC_IMPLICIT_FB),
    DEVICE_FLG(0x04d8, 0xfeea, /* Benchmark DAC1 Pre */
    QUIRK_FLAG_GET_SAMPLE_RATE),
    DEVICE_FLG(0x04e8, 0xa051, /* Samsung USBC Headset (AKG) */
    @@ -1826,6 +1828,10 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
    QUIRK_FLAG_GET_SAMPLE_RATE),
    DEVICE_FLG(0x074d, 0x3553, /* Outlaw RR2150 (Micronas UAC3553B) */
    QUIRK_FLAG_GET_SAMPLE_RATE),
    + DEVICE_FLG(0x0763, 0x2030, /* M-Audio Fast Track C400 */
    + QUIRK_FLAG_GENERIC_IMPLICIT_FB),
    + DEVICE_FLG(0x0763, 0x2031, /* M-Audio Fast Track C600 */
    + QUIRK_FLAG_GENERIC_IMPLICIT_FB),
    DEVICE_FLG(0x08bb, 0x2702, /* LineX FM Transmitter */
    QUIRK_FLAG_IGNORE_CTL_ERROR),
    DEVICE_FLG(0x0951, 0x16ad, /* Kingston HyperX */
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 00:33    [W:2.679 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site