summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCon Kolivas <con@kolivas.org>2016-12-09 15:15:57 +1100
committerSasha Levin <alexander.levin@verizon.com>2017-01-15 09:49:51 -0500
commit9eb0316c4d37da93d2199a48165e9c2d8277e68b (patch)
treecb0e33920da4cfd5575209029b3dc69fe4b48343
parent4aedc0b0c6462f7facd60e4ef70150234aae643a (diff)
downloadlinux-stable-9eb0316c4d37da93d2199a48165e9c2d8277e68b.tar.gz
linux-stable-9eb0316c4d37da93d2199a48165e9c2d8277e68b.tar.bz2
linux-stable-9eb0316c4d37da93d2199a48165e9c2d8277e68b.zip
ALSA: usb-audio: Add QuickCam Communicate Deluxe/S7500 to volume_control_quirks
[ Upstream commit 82ffb6fc637150b279f49e174166d2aa3853eaf4 ] The Logitech QuickCam Communicate Deluxe/S7500 microphone fails with the following warning. [ 6.778995] usb 2-1.2.2.2: Warning! Unlikely big volume range (=3072), cval->res is probably wrong. [ 6.778996] usb 2-1.2.2.2: [5] FU [Mic Capture Volume] ch = 1, val = 4608/7680/1 Adding it to the list of devices in volume_control_quirks makes it work properly, fixing related typo. Signed-off-by: Con Kolivas <kernel@kolivas.org> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-rw-r--r--sound/usb/mixer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 0d7f1ced1d3b..1ceeb9e875a4 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -916,9 +916,10 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval,
case USB_ID(0x046d, 0x0826): /* HD Webcam c525 */
case USB_ID(0x046d, 0x08ca): /* Logitech Quickcam Fusion */
case USB_ID(0x046d, 0x0991):
+ case USB_ID(0x046d, 0x09a2): /* QuickCam Communicate Deluxe/S7500 */
/* Most audio usb devices lie about volume resolution.
* Most Logitech webcams have res = 384.
- * Proboly there is some logitech magic behind this number --fishor
+ * Probably there is some logitech magic behind this number --fishor
*/
if (!strcmp(kctl->id.name, "Mic Capture Volume")) {
usb_audio_info(chip,