leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

Browse Source
This commit is contained in:
Mark Brown 2016-03-05 21:26:28 +09:00
commit 1c750eb580
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/soc-dapm.c
View File

@ -3573,7 +3573,7 @@ static int snd_soc_dapm_dai_link_get(struct snd_kcontrol *kcontrol,
{ {
struct snd_soc_dapm_widget *w = snd_kcontrol_chip(kcontrol); struct snd_soc_dapm_widget *w = snd_kcontrol_chip(kcontrol);
ucontrol->value.integer.value[0] = w->params_select; ucontrol->value.enumerated.item[0] = w->params_select;
return 0; return 0;
} }
@ -3587,13 +3587,13 @@ static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol,
if (w->power) if (w->power)
return -EBUSY; return -EBUSY;
if (ucontrol->value.integer.value[0] == w->params_select) if (ucontrol->value.enumerated.item[0] == w->params_select)
return 0; return 0;
if (ucontrol->value.integer.value[0] >= w->num_params) if (ucontrol->value.enumerated.item[0] >= w->num_params)
return -EINVAL; return -EINVAL;
w->params_select = ucontrol->value.integer.value[0]; w->params_select = ucontrol->value.enumerated.item[0];
return 0; return 0;
} }