xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer

Browse Source 
commit 4739d88ad8e1900f809f8a5c98f3c1b65bf76220 upstream.

msm_routing_put_audio_mixer() can return incorrect value in various scenarios.

scenario 1:
amixer cset iface=MIXER,name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1
amixer cset iface=MIXER,name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0

return value is 0 instead of 1 eventhough value was changed

scenario 2:
amixer cset iface=MIXER,name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1
amixer cset iface=MIXER,name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1

return value is 1 instead of 0 eventhough the value was not changed

scenario 3:
amixer cset iface=MIXER,name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0
return value is 1 instead of 0 eventhough the value was not changed

Fix this by adding checks, so that change notifications are sent correctly.

Fixes: e3a33673e8 ("ASoC: qdsp6: q6routing: Add q6routing driver")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20211130163110.5628-1-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Srinivas Kandagatla
2021-11-30 16:31:10 +00:00
committed by Greg Kroah-Hartman
parent 2f4764fe36
commit 62e4dc5e13
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/qcom/qdsp6/q6routing.c
View File

@@ -488,14 +488,16 @@ static int msm_routing_put_audio_mixer(struct snd_kcontrol *kcontrol,
struct session_data *session = &data->sessions[session_id]; struct session_data *session = &data->sessions[session_id];
if (ucontrol->value.integer.value[0]) { if (ucontrol->value.integer.value[0]) {
if (session->port_id == be_id)
return 0;
session->port_id = be_id; session->port_id = be_id;
snd_soc_dapm_mixer_update_power(dapm, kcontrol, 1, update); snd_soc_dapm_mixer_update_power(dapm, kcontrol, 1, update);
} else { } else {
if (session->port_id == be_id) { if (session->port_id == -1 || session->port_id != be_id)
session->port_id = -1;
return 0; return 0;
}
session->port_id = -1;
snd_soc_dapm_mixer_update_power(dapm, kcontrol, 0, update); snd_soc_dapm_mixer_update_power(dapm, kcontrol, 0, update);
} }