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

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

Merge "ASoC: mbhc: Fix left channel getting disabled in hs_rem_irq"

parents 87802a6f a8f9dc90

asoc/codecs/wcd-mbhc-adc.c

+1 −4
Original line number Diff line number Diff line
@@ -987,8 +987,6 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) 
		if (mbhc->mbhc_cb->hph_pa_on_status)

			if (mbhc->mbhc_cb->hph_pa_on_status(mbhc->component)) {

				hphpa_on = true;

				WCD_MBHC_REG_UPDATE_BITS(

					WCD_MBHC_HPHL_PA_EN, 0);

				WCD_MBHC_REG_UPDATE_BITS(

					WCD_MBHC_HPH_PA_EN, 0);

			}
@@ -1033,8 +1031,7 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) 


		if (hphpa_on) {

			hphpa_on = false;

			WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_HPHL_PA_EN, 1);

			WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_HPH_PA_EN, 1);

			WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_HPH_PA_EN, 3);

		}

	}

exit:

asoc/codecs/wcd-mbhc-legacy.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

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

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

 */

#include <linux/module.h>

#include <linux/init.h>
@@ -916,7 +916,7 @@ static irqreturn_t wcd_mbhc_hs_rem_irq(int irq, void *data) 
	if (hphpa_on) {

		hphpa_on = false;

		WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_HPHL_PA_EN, 1);

		WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_HPH_PA_EN, 1);

		WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_HPHR_PA_EN, 1);

	}

	hphl_trigerred = 0;

	mic_trigerred = 0;