diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-09-01 16:09:12 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-09-01 16:09:12 +0300 |
| commit | 041af76890ba66f6222dd910807fe0b170109e7d (patch) | |
| tree | fb2a4ea4b38544b843da103c1273127ef9969edd /sound/usb/quirks.c | |
| parent | f51ba1148a810a16eead9f0b29bfa2a8f8ab3afb (diff) | |
| parent | ff878b408a03bef5d610b7e2302702e16a53636e (diff) | |
| download | linux-041af76890ba66f6222dd910807fe0b170109e7d.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 1b05b0220fad..194c75c45628 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -2066,7 +2066,7 @@ bool snd_usb_registration_quirk(struct snd_usb_audio *chip, int iface) for (q = registration_quirks; q->usb_id; q++) if (chip->usb_id == q->usb_id) - return iface != q->interface; + return iface < q->interface; /* Register as normal */ return false; @@ -2205,6 +2205,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER), DEVICE_FLG(0x21b4, 0x0081, /* AudioQuest DragonFly */ QUIRK_FLAG_GET_SAMPLE_RATE), + DEVICE_FLG(0x2522, 0x0007, /* LH Labs Geek Out HD Audio 1V5 */ + QUIRK_FLAG_SET_IFACE_FIRST), DEVICE_FLG(0x2708, 0x0002, /* Audient iD14 */ QUIRK_FLAG_IGNORE_CTL_ERROR), DEVICE_FLG(0x2912, 0x30c8, /* Audioengine D1 */ |