diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:53:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:53:50 +0100 |
| commit | 0066f3b93e144762b409940fa37bb1cd36c1baf7 (patch) | |
| tree | 0c99b2754fb16c2a787bc1d086bd6fb268b12b1a /sound/usb/mixer.c | |
| parent | e65312fe868da53077780de618e213a53dc90d00 (diff) | |
| parent | b8ad0f912b93c23c34dfedc615a0eeba6ca29463 (diff) | |
| download | blackbird-op-linux-0066f3b93e144762b409940fa37bb1cd36c1baf7.tar.gz blackbird-op-linux-0066f3b93e144762b409940fa37bb1cd36c1baf7.zip | |
Merge branch 'perf/urgent' into perf/core
Merge the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 44b0ba4feab3..1bed780e21d9 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -883,6 +883,7 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, } break; + case USB_ID(0x046d, 0x0807): /* Logitech Webcam C500 */ case USB_ID(0x046d, 0x0808): case USB_ID(0x046d, 0x0809): case USB_ID(0x046d, 0x081b): /* HD Webcam c310 */ |
