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

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

Merge "ASoC: wcd-mbhc: add null pointer check" into msm-4.9

parents 388ff625 2b660e6a

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

+4 −2
Original line number Diff line number Diff line
@@ -1233,7 +1233,8 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
					mbhc->hs_detect_work_stop);

			wcd_enable_curr_micbias(mbhc,

						WCD_MBHC_EN_NONE);

			if (mbhc->micbias_enable) {

			if (mbhc->mbhc_cb->mbhc_micb_ctrl_thr_mic &&

				mbhc->micbias_enable) {

				mbhc->mbhc_cb->mbhc_micb_ctrl_thr_mic(

					mbhc->codec, MIC_BIAS_2, false);

				if (mbhc->mbhc_cb->set_micbias_value)
@@ -1258,7 +1259,8 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
					mbhc->hs_detect_work_stop);

			wcd_enable_curr_micbias(mbhc,

						WCD_MBHC_EN_NONE);

			if (mbhc->micbias_enable) {

			if (mbhc->mbhc_cb->mbhc_micb_ctrl_thr_mic &&

				mbhc->micbias_enable) {

				mbhc->mbhc_cb->mbhc_micb_ctrl_thr_mic(

					mbhc->codec, MIC_BIAS_2, false);

				if (mbhc->mbhc_cb->set_micbias_value)