Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d900e0f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd9xxx: Correct wrong check conditions"

parents 9e3800f1 42742b7f

sound/soc/codecs/msm8x10-wcd.c

+1 −1
Original line number Diff line number Diff line
@@ -2846,7 +2846,7 @@ static int msm8x10_wcd_enable_mbhc_micbias(struct snd_soc_codec *codec, 
		rc = snd_soc_dapm_force_enable_pin(&codec->dapm,

			DAPM_MICBIAS_EXTERNAL_STANDALONE);

	else {

		if (msm8x10_wcd->micb_en_count > 0) {

		if (msm8x10_wcd->micb_en_count > 1) {

			msm8x10_wcd->micb_en_count--;

			pr_debug("%s micb_en_count : %d", __func__,

					msm8x10_wcd->micb_en_count);

sound/soc/codecs/wcd9xxx-mbhc.c

+3 −3
Original line number Diff line number Diff line
@@ -1666,9 +1666,9 @@ wcd9xxx_find_plug_type(struct wcd9xxx_mbhc *mbhc, 
		}

	}



	if (type == PLUG_TYPE_HEADSET && dvddio) {

		if ((dvddio->_vdces > hs_max) ||

		    (dvddio->_vdces > minv + WCD9XXX_THRESHOLD_MIC_THRESHOLD)) {

	if (type == PLUG_TYPE_HEADSET) {

		if (dvddio && ((dvddio->_vdces > hs_max) ||

		   (dvddio->_vdces > minv + WCD9XXX_THRESHOLD_MIC_THRESHOLD))) {

			pr_debug("%s: Headset with threshold on MIC detected\n",

				 __func__);

			if (mbhc->mbhc_cfg->micbias_enable_flags &