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

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

Merge "ASoC: wcd9306: Update condition to disable HPH PA after impedance detection"

parents 037f291a 033a1d4d

sound/soc/codecs/wcd9306.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -5653,7 +5653,9 @@ static int tapan_setup_zdet(struct wcd9xxx_mbhc *mbhc, 
				mux_wait_us + WCD9XXX_USLEEP_RANGE_MARGIN_US);

				mux_wait_us + WCD9XXX_USLEEP_RANGE_MARGIN_US);

		break;

		break;

	case MBHC_ZDET_PA_DISABLE:

	case MBHC_ZDET_PA_DISABLE:

		if (!mbhc->hph_pa_dac_state)

		if (!mbhc->hph_pa_dac_state &&

			(!(test_bit(MBHC_EVENT_PA_HPHL, &mbhc->event_state) ||

			test_bit(MBHC_EVENT_PA_HPHR, &mbhc->event_state))))

			wcd9xxx_enable_static_pa(mbhc, false);

			wcd9xxx_enable_static_pa(mbhc, false);

		wcd9xxx_restore_registers(codec, &tapan->reg_save_restore);

		wcd9xxx_restore_registers(codec, &tapan->reg_save_restore);

		break;

		break;