From: Takashi Iwai Date: Mon, 23 May 2022 05:48:16 +0000 (+0200) Subject: Merge branch 'for-linus' into for-next X-Git-Tag: v6.6.17~6759^2~82 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1212fa1b482ea09c19aed29001465799e85ea6c3;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'for-linus' into for-next Merge for 5.18-rc1 Signed-off-by: Takashi Iwai --- 1212fa1b482ea09c19aed29001465799e85ea6c3 diff --cc sound/usb/quirks.c index 5461cdf,fbbe5905..e8468f9 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@@ -1824,12 -1822,10 +1824,14 @@@ static const struct usb_audio_quirk_fla QUIRK_FLAG_IGNORE_CTL_ERROR), DEVICE_FLG(0x06f8, 0xd002, /* Hercules DJ Console (Macintosh Edition) */ QUIRK_FLAG_IGNORE_CTL_ERROR), + DEVICE_FLG(0x0711, 0x5800, /* MCT Trigger 5 USB-to-HDMI */ + 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 */