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

Commit d0fc93c8 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: Account for inconsistency in dce_z during button press"

parents d38150ce 272152ba

sound/soc/codecs/wcd9xxx-mbhc.c

+6 −2
Original line number Diff line number Diff line
@@ -3242,7 +3242,9 @@ irqreturn_t wcd9xxx_dce_handler(int irq, void *data) 
				 __func__);

			if (mbhc->update_z) {

				wcd9xxx_update_z(mbhc);

				mbhc->update_z = false;

				dce_z = mbhc->mbhc_data.dce_z;

				sta_z = mbhc->mbhc_data.sta_z;

				mbhc->update_z = true;

			}

			stamv = __wcd9xxx_codec_sta_dce_v(mbhc, 0, sta, sta_z,

						mbhc->mbhc_data.micb_mv);
@@ -3268,7 +3270,9 @@ irqreturn_t wcd9xxx_dce_handler(int irq, void *data) 


	if (mbhc->update_z) {

		wcd9xxx_update_z(mbhc);

		mbhc->update_z = false;

		dce_z = mbhc->mbhc_data.dce_z;

		sta_z = mbhc->mbhc_data.sta_z;

		mbhc->update_z = true;

	}



	stamv = __wcd9xxx_codec_sta_dce_v(mbhc, 0, sta, sta_z,