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

Commit 83eac4f9 authored by Soumya Managoli's avatar Soumya Managoli Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: Fix overflow error in routing driver 



The reg in soc_dapm_mux is 32-bit. The BE DAI ID passed
as shift(to be operated on the reg) may be more than 31,
which may cause overflow.
Set reg field to SND_SOC_NOPM to avoid any DAPM operation
while passing BE IDs in shift_l field and hence avoid overflow.

Change-Id: Ibbbca04c61b7c56eb4c5a7485a4e93dc28a09709
Signed-off-by: default avatarSoumya Managoli <smanag@codeaurora.org>
parent 5e5e15d6

asoc/msm-pcm-routing-v2.c

+5 −5
Original line number Diff line number Diff line
@@ -12829,28 +12829,28 @@ static const int const int4_mi2s_rx_vi_fb_tx_stereo_ch_value[] = { 
};









static const struct soc_enum slim0_rx_vi_fb_lch_mux_enum =









	SOC_VALUE_ENUM_DOUBLE(0, MSM_BACKEND_DAI_SLIMBUS_0_RX, 0, 0,









	SOC_VALUE_ENUM_DOUBLE(SND_SOC_NOPM, MSM_BACKEND_DAI_SLIMBUS_0_RX, 0, 0,









	ARRAY_SIZE(slim0_rx_vi_fb_tx_lch_mux_text),









	slim0_rx_vi_fb_tx_lch_mux_text, slim0_rx_vi_fb_tx_lch_value);

















static const struct soc_enum slim0_rx_vi_fb_rch_mux_enum =









	SOC_VALUE_ENUM_DOUBLE(0, MSM_BACKEND_DAI_SLIMBUS_0_RX, 0, 0,









	SOC_VALUE_ENUM_DOUBLE(SND_SOC_NOPM, MSM_BACKEND_DAI_SLIMBUS_0_RX, 0, 0,









	ARRAY_SIZE(slim0_rx_vi_fb_tx_rch_mux_text),









	slim0_rx_vi_fb_tx_rch_mux_text, slim0_rx_vi_fb_tx_rch_value);

















static const struct soc_enum mi2s_rx_vi_fb_mux_enum =









	SOC_VALUE_ENUM_DOUBLE(0, MSM_BACKEND_DAI_PRI_MI2S_RX, 0, 0,









	SOC_VALUE_ENUM_DOUBLE(SND_SOC_NOPM, MSM_BACKEND_DAI_PRI_MI2S_RX, 0, 0,









	ARRAY_SIZE(mi2s_rx_vi_fb_tx_mux_text),









	mi2s_rx_vi_fb_tx_mux_text, mi2s_rx_vi_fb_tx_value);

















static const struct soc_enum int4_mi2s_rx_vi_fb_mono_ch_mux_enum =









	SOC_VALUE_ENUM_DOUBLE(0, MSM_BACKEND_DAI_INT4_MI2S_RX, 0, 0,









	SOC_VALUE_ENUM_DOUBLE(SND_SOC_NOPM, MSM_BACKEND_DAI_INT4_MI2S_RX, 0, 0,









	ARRAY_SIZE(int4_mi2s_rx_vi_fb_tx_mono_mux_text),









	int4_mi2s_rx_vi_fb_tx_mono_mux_text,









	int4_mi2s_rx_vi_fb_tx_mono_ch_value);

















static const struct soc_enum int4_mi2s_rx_vi_fb_stereo_ch_mux_enum =









	SOC_VALUE_ENUM_DOUBLE(0, MSM_BACKEND_DAI_INT4_MI2S_RX, 0, 0,









	SOC_VALUE_ENUM_DOUBLE(SND_SOC_NOPM, MSM_BACKEND_DAI_INT4_MI2S_RX, 0, 0,









	ARRAY_SIZE(int4_mi2s_rx_vi_fb_tx_stereo_mux_text),









	int4_mi2s_rx_vi_fb_tx_stereo_mux_text,









	int4_mi2s_rx_vi_fb_tx_stereo_ch_value);