diff options
| author | Chris Zankel <chris@zankel.net> | 2013-09-06 02:12:08 +0200 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2013-09-06 02:12:08 +0200 |
| commit | 0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd (patch) | |
| tree | fc0354e4da0ff5ab8b8eb65d60d9a8359d02634d /sound/usb/mixer.c | |
| parent | Linux 3.11-rc2 (diff) | |
| parent | Linux 3.11 (diff) | |
| download | linux-0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd.tar.xz linux-0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd.zip | |
Merge tag 'v3.11' into for_next
Update Xtensa tree to Linux 3.11 (merging)
Diffstat (limited to 'sound/usb/mixer.c')
| -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 d5438083fd6a..95558ef4a7a0 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -888,6 +888,7 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, case USB_ID(0x046d, 0x081b): /* HD Webcam c310 */ case USB_ID(0x046d, 0x081d): /* HD Webcam c510 */ case USB_ID(0x046d, 0x0825): /* HD Webcam c270 */ + case USB_ID(0x046d, 0x0826): /* HD Webcam c525 */ case USB_ID(0x046d, 0x0991): /* Most audio usb devices lie about volume resolution. * Most Logitech webcams have res = 384. |