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

Commit 48696dd1 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: codecs: Add NULL check before calling bcs_enable callback function"

parents 8d1fa55f 6704949d

asoc/codecs/wcd-mbhc-adc.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -683,6 +683,7 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
	 */

	 */

	if (plug_type == MBHC_PLUG_TYPE_HEADSET ||

	if (plug_type == MBHC_PLUG_TYPE_HEADSET ||

	    plug_type == MBHC_PLUG_TYPE_HEADPHONE)

	    plug_type == MBHC_PLUG_TYPE_HEADPHONE)

		if (mbhc->mbhc_cb->bcs_enable)

			mbhc->mbhc_cb->bcs_enable(mbhc, false);

			mbhc->mbhc_cb->bcs_enable(mbhc, false);





	timeout = jiffies + msecs_to_jiffies(HS_DETECT_PLUG_TIME_MS);

	timeout = jiffies + msecs_to_jiffies(HS_DETECT_PLUG_TIME_MS);
@@ -830,6 +831,7 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
	}

	}

	if ((plug_type == MBHC_PLUG_TYPE_HEADSET ||

	if ((plug_type == MBHC_PLUG_TYPE_HEADSET ||

	    plug_type == MBHC_PLUG_TYPE_HEADPHONE))

	    plug_type == MBHC_PLUG_TYPE_HEADPHONE))

		if (mbhc->mbhc_cb->bcs_enable)

			mbhc->mbhc_cb->bcs_enable(mbhc, true);

			mbhc->mbhc_cb->bcs_enable(mbhc, true);





	if (!wrk_complete) {

	if (!wrk_complete) {