diff options
| author | Takashi Iwai | 2015-01-26 13:53:41 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2015-01-26 13:53:41 +0100 |
| commit | 7533185eeefd087d5472422181ae8edf75118213 (patch) | |
| tree | 6a62ccb019668215f70bcc9876a795548f57262a /sound/usb | |
| parent | ALSA: hda - Enable docking station for an HP machine (diff) | |
| parent | ALSA: seq-dummy: remove deadlock-causing events on close (diff) | |
| download | kernel-qcow2-linux-7533185eeefd087d5472422181ae8edf75118213.tar.gz kernel-qcow2-linux-7533185eeefd087d5472422181ae8edf75118213.tar.xz kernel-qcow2-linux-7533185eeefd087d5472422181ae8edf75118213.zip | |
Merge branch 'for-linus' into for-next
Sync with the latest 3.19-rc state for applying other ALSA sequencer
core fixes.
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/mixer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 41650d5b93b7..3e2ef61c627b 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -913,6 +913,7 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, case USB_ID(0x046d, 0x0807): /* Logitech Webcam C500 */ case USB_ID(0x046d, 0x0808): case USB_ID(0x046d, 0x0809): + case USB_ID(0x046d, 0x0819): /* Logitech Webcam C210 */ case USB_ID(0x046d, 0x081b): /* HD Webcam c310 */ case USB_ID(0x046d, 0x081d): /* HD Webcam c510 */ case USB_ID(0x046d, 0x0825): /* HD Webcam c270 */ |