|
@@ -1285,19 +1285,11 @@ static int snd_cs4231_timer(struct snd_card *card)
|
|
|
static int snd_cs4231_info_mux(struct snd_kcontrol *kcontrol,
|
|
|
struct snd_ctl_elem_info *uinfo)
|
|
|
{
|
|
|
- static char *texts[4] = {
|
|
|
+ static const char * const texts[4] = {
|
|
|
"Line", "CD", "Mic", "Mix"
|
|
|
};
|
|
|
|
|
|
- uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
|
|
|
- uinfo->count = 2;
|
|
|
- uinfo->value.enumerated.items = 4;
|
|
|
- if (uinfo->value.enumerated.item > 3)
|
|
|
- uinfo->value.enumerated.item = 3;
|
|
|
- strcpy(uinfo->value.enumerated.name,
|
|
|
- texts[uinfo->value.enumerated.item]);
|
|
|
-
|
|
|
- return 0;
|
|
|
+ return snd_ctl_enum_info(uinfo, 2, 4, texts);
|
|
|
}
|
|
|
|
|
|
static int snd_cs4231_get_mux(struct snd_kcontrol *kcontrol,
|