diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 12:48:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 12:48:03 -0400 |
| commit | bc23416cd4579093acc1e7d819eee747def623da (patch) | |
| tree | 4fab11d6dac818927e5d80c5fddcf903412dd4fc /drivers/usb | |
| parent | ad8456361fa19068cf49b50a4f98e41b73c08e76 (diff) | |
| parent | d4376802999d478a103868d7e7b1f473e4a387af (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda-intel - fix wallclk variable update and condition
ALSA: asihpi - Fix uninitialized variable
ALSA: hda: Use LPIB for ASUS M2V
usb/gadget: Replace the old USB audio FU definitions in f_audio.c
ASoC: MX31ads sound support should depend on MACH_MX31ADS_WM1133_EV1
ASoC: Add missing Kconfig entry for Phytec boards
ALSA: usb-audio: export UAC2 clock selectors as mixer controls
ALSA: usb-audio: clean up find_audio_control_unit()
ALSA: usb-audio: add UAC2 sepecific Feature Unit controls
ALSA: usb-audio: unify constants from specification
ALSA: usb-audio: parse clock topology of UAC2 devices
ALSA: usb-audio: fix selector unit string index accessor
include/linux/usb/audio-v2.h: add more UAC2 details
ALSA: usb-audio: support partially write-protected UAC2 controls
ALSA: usb-audio: UAC2: clean up parsing of bmaControls
ALSA: hda: Use LPIB for another mainboard
ALSA: hda: Use mb31 quirk for an iMac model
ALSA: hda: Use LPIB for an ASUS device
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/f_audio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c index 43bf44514c41..b91115f84b13 100644 --- a/drivers/usb/gadget/f_audio.c +++ b/drivers/usb/gadget/f_audio.c | |||
| @@ -101,7 +101,7 @@ static struct uac_feature_unit_descriptor_0 feature_unit_desc = { | |||
| 101 | static struct usb_audio_control mute_control = { | 101 | static struct usb_audio_control mute_control = { |
| 102 | .list = LIST_HEAD_INIT(mute_control.list), | 102 | .list = LIST_HEAD_INIT(mute_control.list), |
| 103 | .name = "Mute Control", | 103 | .name = "Mute Control", |
| 104 | .type = UAC_MUTE_CONTROL, | 104 | .type = UAC_FU_MUTE, |
| 105 | /* Todo: add real Mute control code */ | 105 | /* Todo: add real Mute control code */ |
| 106 | .set = generic_set_cmd, | 106 | .set = generic_set_cmd, |
| 107 | .get = generic_get_cmd, | 107 | .get = generic_get_cmd, |
| @@ -110,7 +110,7 @@ static struct usb_audio_control mute_control = { | |||
| 110 | static struct usb_audio_control volume_control = { | 110 | static struct usb_audio_control volume_control = { |
| 111 | .list = LIST_HEAD_INIT(volume_control.list), | 111 | .list = LIST_HEAD_INIT(volume_control.list), |
| 112 | .name = "Volume Control", | 112 | .name = "Volume Control", |
| 113 | .type = UAC_VOLUME_CONTROL, | 113 | .type = UAC_FU_VOLUME, |
| 114 | /* Todo: add real Volume control code */ | 114 | /* Todo: add real Volume control code */ |
| 115 | .set = generic_set_cmd, | 115 | .set = generic_set_cmd, |
| 116 | .get = generic_get_cmd, | 116 | .get = generic_get_cmd, |