summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCon Kolivas <con@kolivas.org>2016-12-09 15:15:57 +1100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-06 11:16:08 +0100
commitd0ba0f6a82914e684e5d9ae2cae702bed75670fe (patch)
treef1eff219edf8d5b7a774b5a56a4c5e97983b714d
parentcbb2a2563587fe344156b37b614d168d6faa4238 (diff)
downloadlinux-stable-d0ba0f6a82914e684e5d9ae2cae702bed75670fe.tar.gz
linux-stable-d0ba0f6a82914e684e5d9ae2cae702bed75670fe.tar.bz2
linux-stable-d0ba0f6a82914e684e5d9ae2cae702bed75670fe.zip
ALSA: usb-audio: Add QuickCam Communicate Deluxe/S7500 to volume_control_quirks
commit 82ffb6fc637150b279f49e174166d2aa3853eaf4 upstream. 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> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 4f85757009b3..499b03c8281d 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -931,9 +931,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,