summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJonas Hahnfeld <hahnjo@hahnjo.de>2022-01-31 21:35:16 +0300
committerTakashi Iwai <tiwai@suse.de>2022-02-01 10:11:50 +0300
commit4ee02e20893d2f9e951c7888f2284fa608ddaa35 (patch)
tree0f7dbf5c713242c713cf1f6dc90dd2d73b3461f3 /sound
parentff4865b3c8cd746ef72f59bdd485848b4cebd43d (diff)
downloadlinux-4ee02e20893d2f9e951c7888f2284fa608ddaa35.tar.xz
ALSA: usb-audio: Correct quirk for VF0770
This device provides both audio and video. The original quirk added in commit 48827e1d6af5 ("ALSA: usb-audio: Add quirk for VF0770") used USB_DEVICE to match the vendor and product ID. Depending on module order, if snd-usb-audio was asked first, it would match the entire device and uvcvideo wouldn't get to see it. Change the matching to USB_AUDIO_DEVICE to restore uvcvideo matching in all cases. Fixes: 48827e1d6af5 ("ALSA: usb-audio: Add quirk for VF0770") Reported-by: Jukka Heikintalo <heikintalo.jukka@gmail.com> Tested-by: Jukka Heikintalo <heikintalo.jukka@gmail.com> Reported-by: Paweł Susicki <pawel.susicki@gmail.com> Tested-by: Paweł Susicki <pawel.susicki@gmail.com> Cc: <stable@vger.kernel.org> # 5.4, 5.10, 5.14, 5.15 Signed-off-by: Jonas Hahnfeld <hahnjo@hahnjo.de> Link: https://lore.kernel.org/r/20220131183516.61191-1-hahnjo@hahnjo.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/quirks-table.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index b1522e43173e..0ea39565e623 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -84,7 +84,7 @@
* combination.
*/
{
- USB_DEVICE(0x041e, 0x4095),
+ USB_AUDIO_DEVICE(0x041e, 0x4095),
.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,