diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-08 10:33:24 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-08 10:33:24 (GMT) |
| commit | 77de61c3975da6f2200935c341e84018ece6ce36 (patch) | |
| tree | 36508cf93ef62a80c988fa18c86eda1274e03877 /sound/aoa/codecs/tas.c | |
| parent | 66139a48cee1530c91f37c145384b4ee7043f0b7 (diff) | |
| parent | 048184540171672a724ab8f8bada7fcc0762f5c6 (diff) | |
| download | linux-77de61c3975da6f2200935c341e84018ece6ce36.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/aoa/codecs/tas.c')
| -rw-r--r-- | sound/aoa/codecs/tas.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c index cf3c630..364c7c4 100644 --- a/sound/aoa/codecs/tas.c +++ b/sound/aoa/codecs/tas.c @@ -478,15 +478,9 @@ static struct snd_kcontrol_new drc_switch_control = { static int tas_snd_capture_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - static char *texts[] = { "Line-In", "Microphone" }; + static const char * const texts[] = { "Line-In", "Microphone" }; - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = 1; - uinfo->value.enumerated.items = 2; - if (uinfo->value.enumerated.item > 1) - uinfo->value.enumerated.item = 1; - strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); - return 0; + return snd_ctl_enum_info(uinfo, 1, 2, texts); } static int tas_snd_capture_source_get(struct snd_kcontrol *kcontrol, |