Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 May 2022 05:48:16 +0000 (07:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 May 2022 05:48:27 +0000 (07:48 +0200)
Merge for 5.18-rc1

Signed-off-by: Takashi Iwai <tiwai@suse.de>
1  2 
drivers/firewire/core-card.c
drivers/firewire/core-cdev.c
drivers/firewire/core-transaction.c
sound/pci/hda/patch_realtek.c
sound/soc/codecs/cs35l41-lib.c
sound/usb/quirks.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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 */