| From 4ee02e20893d2f9e951c7888f2284fa608ddaa35 Mon Sep 17 00:00:00 2001 |
| From: Jonas Hahnfeld <hahnjo@hahnjo.de> |
| Date: Mon, 31 Jan 2022 19:35:16 +0100 |
| Subject: ALSA: usb-audio: Correct quirk for VF0770 |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Jonas Hahnfeld <hahnjo@hahnjo.de> |
| |
| commit 4ee02e20893d2f9e951c7888f2284fa608ddaa35 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| sound/usb/quirks-table.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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, |
