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

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

Merge "asoc: codecs: add a null pointer check in mbhc driver"

parents d156f031 76c5b45e

asoc/codecs/wcd-mbhc-legacy.c

+5 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -533,7 +533,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)
@@ -558,7 +559,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)