diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-01-20 09:25:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-01-20 09:25:33 +0100 |
| commit | 7bba999e939f6d20e4db66effeecc179ed896496 (patch) | |
| tree | 2d044d6a466a798b0c779e2fc9e66520b4aae940 /sound/usb | |
| parent | 8cd671d65b4255bb7ce368b4258ef4fd52798468 (diff) | |
| parent | 1a0f59b04c8c9e1177731609e62e2a439cfa3a73 (diff) | |
| download | linux-7bba999e939f6d20e4db66effeecc179ed896496.tar.gz linux-7bba999e939f6d20e4db66effeecc179ed896496.tar.bz2 linux-7bba999e939f6d20e4db66effeecc179ed896496.zip | |
Merge branch 'for-linus' into for-next
Pull pending ASoC and HD-audio fixes for 6.14-rc1
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/quirks.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 8ba0aff8be2e..7968d6a2f592 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -2239,6 +2239,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_CTL_MSG_DELAY_1M), DEVICE_FLG(0x0c45, 0x6340, /* Sonix HD USB Camera */ QUIRK_FLAG_GET_SAMPLE_RATE), + DEVICE_FLG(0x0d8c, 0x0014, /* USB Audio Device */ + QUIRK_FLAG_CTL_MSG_DELAY_1M), DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */ QUIRK_FLAG_FIXED_RATE), DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */ |