Merge "ASoC: sdm660_cdc: Fix ear_pa_gain control"

This commit is contained in:
Linux Build Service Account 2018-01-04 06:39:53 -08:00 committed by Gerrit - the friendly Code Review server
commit bf300152d6

View file

@ -1595,11 +1595,11 @@ static int msm_anlg_cdc_pa_gain_get(struct snd_kcontrol *kcontrol,
if (ear_pa_gain == 0x00) {
ucontrol->value.integer.value[0] = 3;
} else if (ear_pa_gain == 0x01) {
ucontrol->value.integer.value[1] = 2;
ucontrol->value.integer.value[0] = 2;
} else if (ear_pa_gain == 0x02) {
ucontrol->value.integer.value[2] = 1;
ucontrol->value.integer.value[0] = 1;
} else if (ear_pa_gain == 0x03) {
ucontrol->value.integer.value[3] = 0;
ucontrol->value.integer.value[0] = 0;
} else {
dev_err(codec->dev,
"%s: ERROR: Unsupported Ear Gain = 0x%x\n",
@ -1621,7 +1621,6 @@ static int msm_anlg_cdc_pa_gain_get(struct snd_kcontrol *kcontrol,
return -EINVAL;
}
}
ucontrol->value.integer.value[0] = ear_pa_gain;
dev_dbg(codec->dev, "%s: ear_pa_gain = 0x%x\n", __func__, ear_pa_gain);
return 0;
}