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

Commit ca9eb1c8 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: Fix crash when enable mbhc driver logs"

parents 0cabfa0f 6f8fea5b
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -3041,13 +3041,14 @@ static void wcd9xxx_get_z(struct wcd9xxx_mbhc *mbhc, s16 *dce_z, s16 *sta_z)
	change = snd_soc_update_bits(codec, WCD9XXX_A_MAD_ANA_CTRL, 1 << 4,
				     1 << 0);
	usleep_range(1000, 1000 + 1000);
	if (sta_z)
	if (sta_z) {
		*sta_z = wcd9xxx_codec_sta_dce(mbhc, 0, false);
	if (dce_z)
		pr_debug("%s: sta_z 0x%x\n", __func__, *sta_z & 0xFFFF);
	}
	if (dce_z) {
		*dce_z = wcd9xxx_codec_sta_dce(mbhc, 1, false);

	pr_debug("%s: sta_z 0x%x, dce_z 0x%x\n", __func__, *sta_z & 0xFFFF,
		 *dce_z & 0xFFFF);
		pr_debug("%s: dce_z 0x%x\n", __func__, *dce_z & 0xFFFF);
	}

	/* Connect override from micbias */
	if (change)