diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-05 21:26:28 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-05 21:26:28 +0900 |
| commit | 1c750eb580d332f740af456748de4b206e442c3b (patch) | |
| tree | 71da665ca232d3e3acefcd955762871fdcee09bf /sound | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
| parent | 741338f99f16dc24d2d01ac777b0798ae9d10a90 (diff) | |
| download | blackbird-obmc-linux-1c750eb580d332f740af456748de4b206e442c3b.tar.gz blackbird-obmc-linux-1c750eb580d332f740af456748de4b206e442c3b.zip | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 0d3707987900..581175a51ecf 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -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); - ucontrol->value.integer.value[0] = w->params_select; + ucontrol->value.enumerated.item[0] = w->params_select; return 0; } @@ -3587,13 +3587,13 @@ static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol, if (w->power) return -EBUSY; - if (ucontrol->value.integer.value[0] == w->params_select) + if (ucontrol->value.enumerated.item[0] == w->params_select) return 0; - if (ucontrol->value.integer.value[0] >= w->num_params) + if (ucontrol->value.enumerated.item[0] >= w->num_params) return -EINVAL; - w->params_select = ucontrol->value.integer.value[0]; + w->params_select = ucontrol->value.enumerated.item[0]; return 0; } |
