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

Commit e0664be7 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: Don't enable micbias if headset is removed"

parents 83dd8ec0 3c20d5bd

sound/soc/codecs/wcd9xxx-mbhc.c

+2 −2
Original line number Diff line number Diff line
@@ -860,9 +860,9 @@ static void wcd9xxx_report_plug(struct wcd9xxx_mbhc *mbhc, int insertion, 


		if (mbhc->micbias_enable && mbhc->micbias_enable_cb) {

			pr_debug("%s: Disabling micbias\n", __func__);

			mbhc->micbias_enable = false;

			mbhc->micbias_enable_cb(mbhc->codec, false,

						mbhc->mbhc_cfg->micbias);

			mbhc->micbias_enable = false;

		}

		mbhc->zl = mbhc->zr = 0;

		pr_debug("%s: Reporting removal %d(%x)\n", __func__,
@@ -887,9 +887,9 @@ static void wcd9xxx_report_plug(struct wcd9xxx_mbhc *mbhc, int insertion, 
			if (mbhc->micbias_enable && mbhc->micbias_enable_cb &&

			    mbhc->hph_status == SND_JACK_HEADSET) {

				pr_debug("%s: Disabling micbias\n", __func__);

				mbhc->micbias_enable = false;

				mbhc->micbias_enable_cb(mbhc->codec, false,

						mbhc->mbhc_cfg->micbias);

				mbhc->micbias_enable = false;

			}



			pr_debug("%s: Reporting removal (%x)\n",