diff options
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/Kconfig | 1 | ||||
| -rw-r--r-- | sound/usb/mixer.c | 1 | ||||
| -rw-r--r-- | sound/usb/mixer_maps.c | 9 |
3 files changed, 11 insertions, 0 deletions
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index de9408b83f75..e05a86b7c0da 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig | |||
| @@ -14,6 +14,7 @@ config SND_USB_AUDIO | |||
| 14 | select SND_HWDEP | 14 | select SND_HWDEP |
| 15 | select SND_RAWMIDI | 15 | select SND_RAWMIDI |
| 16 | select SND_PCM | 16 | select SND_PCM |
| 17 | select BITREVERSE | ||
| 17 | help | 18 | help |
| 18 | Say Y here to include support for USB audio and USB MIDI | 19 | Say Y here to include support for USB audio and USB MIDI |
| 19 | devices. | 20 | devices. |
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, | |||
| 883 | } | 883 | } |
| 884 | break; | 884 | break; |
| 885 | 885 | ||
| 886 | case USB_ID(0x046d, 0x0807): /* Logitech Webcam C500 */ | ||
| 886 | case USB_ID(0x046d, 0x0808): | 887 | case USB_ID(0x046d, 0x0808): |
| 887 | case USB_ID(0x046d, 0x0809): | 888 | case USB_ID(0x046d, 0x0809): |
| 888 | case USB_ID(0x046d, 0x081b): /* HD Webcam c310 */ | 889 | case USB_ID(0x046d, 0x081b): /* HD Webcam c310 */ |
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index 32af6b741ef5..d1d72ff50347 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c | |||
| @@ -328,6 +328,11 @@ static struct usbmix_name_map gamecom780_map[] = { | |||
| 328 | {} | 328 | {} |
| 329 | }; | 329 | }; |
| 330 | 330 | ||
| 331 | static const struct usbmix_name_map kef_x300a_map[] = { | ||
| 332 | { 10, NULL }, /* firmware locks up (?) when we try to access this FU */ | ||
| 333 | { 0 } | ||
| 334 | }; | ||
| 335 | |||
| 331 | /* | 336 | /* |
| 332 | * Control map entries | 337 | * Control map entries |
| 333 | */ | 338 | */ |
| @@ -419,6 +424,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { | |||
| 419 | .id = USB_ID(0x200c, 0x1018), | 424 | .id = USB_ID(0x200c, 0x1018), |
| 420 | .map = ebox44_map, | 425 | .map = ebox44_map, |
| 421 | }, | 426 | }, |
| 427 | { | ||
| 428 | .id = USB_ID(0x27ac, 0x1000), | ||
| 429 | .map = kef_x300a_map, | ||
| 430 | }, | ||
| 422 | { 0 } /* terminator */ | 431 | { 0 } /* terminator */ |
| 423 | }; | 432 | }; |
| 424 | 433 | ||
