Merge "ASoC: mbhc-adc: Resolve bcs not enabled for us headset" (4374553f) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/codecs/wcd-mbhc-adc.c

+6 −6

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
		*/
		#include <linux/module.h>
		#include <linux/init.h>
		@@ -872,11 +872,6 @@ static void wcd_correct_swch_plug(struct work_struct *work)
		wrk_complete = false;
		}
		}
		if ((plug_type == MBHC_PLUG_TYPE_HEADSET \|\|
		plug_type == MBHC_PLUG_TYPE_HEADPHONE))
		if (mbhc->mbhc_cb->bcs_enable)
		mbhc->mbhc_cb->bcs_enable(mbhc, true);

		if (!wrk_complete) {
		/*
		* If plug_tye is headset, we might have already reported either
		@@ -910,6 +905,11 @@ static void wcd_correct_swch_plug(struct work_struct *work)
		goto exit;
		}

		if ((plug_type == MBHC_PLUG_TYPE_HEADSET \|\|
		plug_type == MBHC_PLUG_TYPE_HEADPHONE))
		if (mbhc->mbhc_cb->bcs_enable)
		mbhc->mbhc_cb->bcs_enable(mbhc, true);

		pr_debug("%s: Valid plug found, plug type %d wrk_cmpt %d btn_intr %d\n",
		__func__, plug_type, wrk_complete,
		mbhc->btn_press_intr);