From: Axel Lin Date: Sat, 5 Nov 2016 07:28:55 +0000 (+0800) Subject: ASoC: msm8916-wcd-analog: Update correct register setting for MIC BIAS Internal1 X-Git-Tag: v4.10-rc1~121^2~3^2~7^4 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b4f89a0cce0d579fda6c1f6db72202c6bf2ae95f;p=linux.git ASoC: msm8916-wcd-analog: Update correct register setting for MIC BIAS Internal1 pm8916_wcd_analog_enable_micbias_int1() should set micbias1_cap_mode rather than micbias2_cap_mode. Also change the order of pm8916_wcd_analog_enable_micbias_int1/init2 functions for better readability. Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index 50ad75ab10ea..d8e8590746af 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c @@ -349,7 +349,7 @@ static int pm8916_wcd_analog_enable_micbias_ext2(struct } -static int pm8916_wcd_analog_enable_micbias_int2(struct +static int pm8916_wcd_analog_enable_micbias_int1(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) @@ -358,10 +358,10 @@ static int pm8916_wcd_analog_enable_micbias_int2(struct struct pm8916_wcd_analog_priv *wcd = snd_soc_codec_get_drvdata(codec); return pm8916_wcd_analog_enable_micbias_int(codec, event, w->reg, - wcd->micbias2_cap_mode); + wcd->micbias1_cap_mode); } -static int pm8916_wcd_analog_enable_micbias_int1(struct +static int pm8916_wcd_analog_enable_micbias_int2(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event)