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

Commit 5557ce5c authored by Laxminath Kasam's avatar Laxminath Kasam Committed by Gerrit - the friendly Code Review server
Browse files

asoc: codecs: Fix out of bound register access 



For TX5 MUX registers, offset is not followed
in TXn order. Update driver to read/write correct
register offset when TX5 MUX registers access.

CRs-Fixed: 2218938
Change-Id: I8958b6cd1847967cbd37e7145c9f3909b0b8853b
Signed-off-by: default avatarLaxminath Kasam <lkasam@codeaurora.org>
parent a2faea16

sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c

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

/* Copyright (c) 2015-2019, 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
@@ -40,6 +40,7 @@ 
#define CF_MIN_3DB_75HZ			0x1

#define CF_MIN_3DB_150HZ		0x2



#define DEC_SVA 5

#define MSM_DIG_CDC_VERSION_ENTRY_SIZE 32



static unsigned long rx_digital_gain_reg[] = {
@@ -213,6 +214,9 @@ static int msm_dig_cdc_put_dec_enum(struct snd_kcontrol *kcontrol, 
	tx_mux_ctl_reg =

		MSM89XX_CDC_CORE_TX1_MUX_CTL + 32 * (decimator - 1);



	if (decimator == DEC_SVA)

		tx_mux_ctl_reg = MSM89XX_CDC_CORE_TX5_MUX_CTL;



	snd_soc_update_bits(codec, tx_mux_ctl_reg, 0x1, adc_dmic_sel);



	ret = snd_soc_dapm_put_enum_double(kcontrol, ucontrol);
@@ -939,7 +943,7 @@ static int msm_dig_cdc_codec_enable_dec(struct snd_soc_dapm_widget *w, 
			 32 * (decimator - 1);

	tx_mux_ctl_reg = MSM89XX_CDC_CORE_TX1_MUX_CTL +

			  32 * (decimator - 1);

	if (decimator == 5) {

	if (decimator == DEC_SVA) {

		tx_vol_ctl_reg = MSM89XX_CDC_CORE_TX5_VOL_CTL_CFG;

		tx_mux_ctl_reg = MSM89XX_CDC_CORE_TX5_MUX_CTL;

	}
@@ -1250,14 +1254,18 @@ static void sdm660_tx_mute_update_callback(struct work_struct *work) 
	dig_cdc = tx_mute_dwork->dig_cdc;

	codec = dig_cdc->codec;



	for (i = 0; i < (NUM_DECIMATORS - 1); i++) {

	for (i = 0; i < NUM_DECIMATORS; i++) {

		if (dig_cdc->dec_active[i])

			decimator = i + 1;

		if (decimator && decimator < NUM_DECIMATORS) {

		if (decimator && decimator <= NUM_DECIMATORS) {

			/* unmute decimators corresponding to Tx DAI's*/

			tx_vol_ctl_reg =

				MSM89XX_CDC_CORE_TX1_VOL_CTL_CFG +

					32 * (decimator - 1);

			if (decimator == DEC_SVA)

				tx_vol_ctl_reg =

					MSM89XX_CDC_CORE_TX5_VOL_CTL_CFG;



			snd_soc_update_bits(codec, tx_vol_ctl_reg,

					0x01, 0x00);

		}