Merge "ASoC: wcd-mbhc: correct cross connection check" (0363b6c3) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/wcd-mbhc-v2.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -886,6 +886,11 @@ static int wcd_check_cross_conn(struct wcd_mbhc *mbhc)
		return -EINVAL;
		}

		/* If PA is enabled, dont check for cross-connection */
		if (mbhc->mbhc_cb->hph_pa_on_status)
		if (mbhc->mbhc_cb->hph_pa_on_status(mbhc->codec))
		return false;

		WCD_MBHC_REG_READ(WCD_MBHC_ELECT_SCHMT_ISRC, reg1);
		/*
		* Check if there is any cross connection,