From: Takashi Iwai <tiwai@xxxxxxx>
commit 7010d9464f7ca3ee2d75095ea2e642a9009a41ff upstream.
The quirk_flags_table[] is sorted in the USB ID order, while the last
fix was put at a wrong position. Adjust the entry at the right
position.
Fixes: 74dba2408818 ("ALSA: usb-audio: Fix microphone sound on HD webcam.")
Cc: <stable@xxxxxxxxxxxxxxx>
Link: https://patch.msgid.link/20240722080605.23481-1-tiwai@xxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/usb/quirks.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -2167,6 +2167,8 @@ static const struct usb_audio_quirk_flag
QUIRK_FLAG_GET_SAMPLE_RATE),
DEVICE_FLG(0x19f7, 0x0035, /* RODE NT-USB+ */
QUIRK_FLAG_GET_SAMPLE_RATE),
+ DEVICE_FLG(0x1bcf, 0x2281, /* HD Webcam */
+ QUIRK_FLAG_GET_SAMPLE_RATE),
DEVICE_FLG(0x1bcf, 0x2283, /* NexiGo N930AF FHD Webcam */
QUIRK_FLAG_GET_SAMPLE_RATE),
DEVICE_FLG(0x2040, 0x7200, /* Hauppauge HVR-950Q */
@@ -2225,8 +2227,6 @@ static const struct usb_audio_quirk_flag
QUIRK_FLAG_ALIGN_TRANSFER),
DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */
QUIRK_FLAG_ALIGN_TRANSFER),
- DEVICE_FLG(0x1bcf, 0x2281, /* HD Webcam */
- QUIRK_FLAG_GET_SAMPLE_RATE),
/* Vendor matches */
VENDOR_FLG(0x045e, /* MS Lifecam */
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-6.10/alsa-usb-audio-fix-microphone-sound-on-hd-webcam.patch
queue-6.10/alsa-firewire-lib-fix-wrong-value-as-length-of-header-for-cip_no_header-case.patch
queue-6.10/alsa-ump-don-t-update-fb-name-for-static-blocks.patch
queue-6.10/alsa-usb-audio-move-hd-webcam-quirk-to-the-right-place.patch
queue-6.10/alsa-ump-force-1-group-for-midi1-fbs.patch
queue-6.10/alsa-hda-realtek-cs35l41-fixup-remaining-asus-strix-models.patch
queue-6.10/alsa-usb-audio-add-a-quirk-for-sonix-hd-usb-camera.patch
