提交 111f4dee 编写于 作者: J Jonas Hahnfeld 提交者: Zheng Zengkai

ALSA: usb-audio: Correct quirk for VF0770

stable inclusion
from stable-v5.10.99
commit 470bbb9cbd8fe115d844222317666f672d32c1fc
bugzilla: https://gitee.com/openeuler/kernel/issues/I55O7H

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=470bbb9cbd8fe115d844222317666f672d32c1fc

--------------------------------

commit 4ee02e20 upstream.

This device provides both audio and video. The original quirk added in
commit 48827e1d ("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: 48827e1d ("ALSA: usb-audio: Add quirk for VF0770")
Reported-by: NJukka Heikintalo <heikintalo.jukka@gmail.com>
Tested-by: NJukka Heikintalo <heikintalo.jukka@gmail.com>
Reported-by: NPaweł Susicki <pawel.susicki@gmail.com>
Tested-by: NPaweł Susicki <pawel.susicki@gmail.com>
Cc: <stable@vger.kernel.org> # 5.4, 5.10, 5.14, 5.15
Signed-off-by: NJonas Hahnfeld <hahnjo@hahnjo.de>
Link: https://lore.kernel.org/r/20220131183516.61191-1-hahnjo@hahnjo.deSigned-off-by: NTakashi Iwai <tiwai@suse.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYu Liao <liaoyu15@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 558b4447
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
* combination. * combination.
*/ */
{ {
USB_DEVICE(0x041e, 0x4095), USB_AUDIO_DEVICE(0x041e, 0x4095),
.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
.ifnum = QUIRK_ANY_INTERFACE, .ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE, .type = QUIRK_COMPOSITE,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册