summaryrefslogtreecommitdiffstats
path: root/sound/usb/quirks.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-08-02 09:04:48 +0200
committerTakashi Iwai <tiwai@suse.de>2021-08-02 09:04:48 +0200
commit01099b1ad9101ca3f41071a87b9c496d9ea1d2ad (patch)
tree0fe7a9b87fd8dea482089c49ce65c4b5b4a9a135 /sound/usb/quirks.c
parentALSA: core: Fix double calls of snd_card_free() via devres (diff)
parentALSA: memalloc: Fix regression with SNDRV_DMA_TYPE_CONTINUOUS (diff)
downloadlinux-01099b1ad9101ca3f41071a87b9c496d9ea1d2ad.tar.xz
linux-01099b1ad9101ca3f41071a87b9c496d9ea1d2ad.zip
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb/quirks.c')
-rw-r--r--sound/usb/quirks.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 8b8bee3c3dd6..326d1b0ea5e6 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1897,6 +1897,10 @@ static const struct registration_quirk registration_quirks[] = {
REG_QUIRK_ENTRY(0x0951, 0x16d8, 2), /* Kingston HyperX AMP */
REG_QUIRK_ENTRY(0x0951, 0x16ed, 2), /* Kingston HyperX Cloud Alpha S */
REG_QUIRK_ENTRY(0x0951, 0x16ea, 2), /* Kingston HyperX Cloud Flight S */
+ REG_QUIRK_ENTRY(0x0ecb, 0x1f46, 2), /* JBL Quantum 600 */
+ REG_QUIRK_ENTRY(0x0ecb, 0x2039, 2), /* JBL Quantum 400 */
+ REG_QUIRK_ENTRY(0x0ecb, 0x203c, 2), /* JBL Quantum 600 */
+ REG_QUIRK_ENTRY(0x0ecb, 0x203e, 2), /* JBL Quantum 800 */
{ 0 } /* terminator */
};