* [PATCH] ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer
@ 2021-11-30 16:04 ` Srinivas Kandagatla
0 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2021-11-30 16:04 UTC (permalink / raw)
To: broonie; +Cc: alsa-devel, lgirdwood, linux-kernel, pierre-louis.bossart, tiwai
msm_routing_put_audio_mixer() can return incorrect value in various scenarios.
Fix this, so that change notifications are sent correctly.
Fixes: e3a33673e845 ("ASoC: qdsp6: q6routing: Add q6routing driver")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
sound/soc/qcom/qdsp6/q6routing.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
index cd74681e811e..928fd23e2c27 100644
--- a/sound/soc/qcom/qdsp6/q6routing.c
+++ b/sound/soc/qcom/qdsp6/q6routing.c
@@ -498,14 +498,16 @@ static int msm_routing_put_audio_mixer(struct snd_kcontrol *kcontrol,
struct session_data *session = &data->sessions[session_id];
if (ucontrol->value.integer.value[0]) {
+ if (session->port_id == be_id)
+ return 0;
+
session->port_id = be_id;
snd_soc_dapm_mixer_update_power(dapm, kcontrol, 1, update);
} else {
- if (session->port_id == be_id) {
- session->port_id = -1;
+ if (session->port_id == -1 || session->port_id != be_id)
return 0;
- }
+ session->port_id = -1;
snd_soc_dapm_mixer_update_power(dapm, kcontrol, 0, update);
}
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer
@ 2021-11-30 16:04 ` Srinivas Kandagatla
0 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2021-11-30 16:04 UTC (permalink / raw)
To: broonie
Cc: lgirdwood, perex, tiwai, pierre-louis.bossart, alsa-devel,
linux-kernel, Srinivas Kandagatla
msm_routing_put_audio_mixer() can return incorrect value in various scenarios.
Fix this, so that change notifications are sent correctly.
Fixes: e3a33673e845 ("ASoC: qdsp6: q6routing: Add q6routing driver")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
sound/soc/qcom/qdsp6/q6routing.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
index cd74681e811e..928fd23e2c27 100644
--- a/sound/soc/qcom/qdsp6/q6routing.c
+++ b/sound/soc/qcom/qdsp6/q6routing.c
@@ -498,14 +498,16 @@ static int msm_routing_put_audio_mixer(struct snd_kcontrol *kcontrol,
struct session_data *session = &data->sessions[session_id];
if (ucontrol->value.integer.value[0]) {
+ if (session->port_id == be_id)
+ return 0;
+
session->port_id = be_id;
snd_soc_dapm_mixer_update_power(dapm, kcontrol, 1, update);
} else {
- if (session->port_id == be_id) {
- session->port_id = -1;
+ if (session->port_id == -1 || session->port_id != be_id)
return 0;
- }
+ session->port_id = -1;
snd_soc_dapm_mixer_update_power(dapm, kcontrol, 0, update);
}
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer
2021-11-30 16:04 ` Srinivas Kandagatla
@ 2021-11-30 16:17 ` Mark Brown
-1 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2021-11-30 16:17 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: alsa-devel, lgirdwood, linux-kernel, pierre-louis.bossart, tiwai
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
On Tue, Nov 30, 2021 at 04:04:14PM +0000, Srinivas Kandagatla wrote:
> msm_routing_put_audio_mixer() can return incorrect value in various scenarios.
> Fix this, so that change notifications are sent correctly.
This really isn't a good commit message - I can't tell what the change
is supposed to fix or how it fixes it. Which values in which scenarios
are incorrect in what way?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer
@ 2021-11-30 16:17 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2021-11-30 16:17 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: lgirdwood, perex, tiwai, pierre-louis.bossart, alsa-devel,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
On Tue, Nov 30, 2021 at 04:04:14PM +0000, Srinivas Kandagatla wrote:
> msm_routing_put_audio_mixer() can return incorrect value in various scenarios.
> Fix this, so that change notifications are sent correctly.
This really isn't a good commit message - I can't tell what the change
is supposed to fix or how it fixes it. Which values in which scenarios
are incorrect in what way?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer
2021-11-30 16:17 ` Mark Brown
@ 2021-11-30 16:22 ` Srinivas Kandagatla
-1 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2021-11-30 16:22 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, lgirdwood, linux-kernel, pierre-louis.bossart, tiwai
On 30/11/2021 16:17, Mark Brown wrote:
> On Tue, Nov 30, 2021 at 04:04:14PM +0000, Srinivas Kandagatla wrote:
>> msm_routing_put_audio_mixer() can return incorrect value in various scenarios.
>> Fix this, so that change notifications are sent correctly.
>
> This really isn't a good commit message - I can't tell what the change
> is supposed to fix or how it fixes it. Which values in which scenarios
> are incorrect in what way?
I agree,
the cases that get incorrect return values are:
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
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
I will add these details in next spin commit log.
--srini
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer
@ 2021-11-30 16:22 ` Srinivas Kandagatla
0 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2021-11-30 16:22 UTC (permalink / raw)
To: Mark Brown
Cc: lgirdwood, perex, tiwai, pierre-louis.bossart, alsa-devel,
linux-kernel
On 30/11/2021 16:17, Mark Brown wrote:
> On Tue, Nov 30, 2021 at 04:04:14PM +0000, Srinivas Kandagatla wrote:
>> msm_routing_put_audio_mixer() can return incorrect value in various scenarios.
>> Fix this, so that change notifications are sent correctly.
>
> This really isn't a good commit message - I can't tell what the change
> is supposed to fix or how it fixes it. Which values in which scenarios
> are incorrect in what way?
I agree,
the cases that get incorrect return values are:
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
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
I will add these details in next spin commit log.
--srini
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-30 16:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-30 16:04 [PATCH] ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer Srinivas Kandagatla
2021-11-30 16:04 ` Srinivas Kandagatla
2021-11-30 16:17 ` Mark Brown
2021-11-30 16:17 ` Mark Brown
2021-11-30 16:22 ` Srinivas Kandagatla
2021-11-30 16:22 ` Srinivas Kandagatla
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.