diff options
| author | Kai-Heng Feng <kai.heng.feng@canonical.com> | 2020-04-30 17:11:39 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-05-01 12:27:17 +0100 |
| commit | 49c22696348d6e7c8a2ecfd7e60fddfe188ded82 (patch) | |
| tree | acdada9c73fe30f9f72296afe0577512868c0857 | |
| parent | 8382f2949a0def8e9519603b77b3c26f81a66576 (diff) | |
| download | linux-stable-49c22696348d6e7c8a2ecfd7e60fddfe188ded82.tar.gz linux-stable-49c22696348d6e7c8a2ecfd7e60fddfe188ded82.tar.bz2 linux-stable-49c22696348d6e7c8a2ecfd7e60fddfe188ded82.zip | |
ASoC: SOF: Update correct LED status at the first time usage of update_mute_led()
At the first time update_mute_led() gets called, if channels are already
muted, the temp value equals to led_value as 0, skipping the following
LED setting.
So set led_value to -1 as an uninitialized state, to update the correct
LED status at first time usage.
Fixes: 5d43001ae436 ("ASoC: SOF: acpi led support for switch controls")
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Acked-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200430091139.7003-1-kai.heng.feng@canonical.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/sof/control.c | 4 | ||||
| -rw-r--r-- | sound/soc/sof/sof-audio.h | 2 | ||||
| -rw-r--r-- | sound/soc/sof/topology.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/sof/control.c b/sound/soc/sof/control.c index dfc412e2d956..6d63768d42aa 100644 --- a/sound/soc/sof/control.c +++ b/sound/soc/sof/control.c @@ -19,8 +19,8 @@ static void update_mute_led(struct snd_sof_control *scontrol, struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - unsigned int temp = 0; - unsigned int mask; + int temp = 0; + int mask; int i; mask = 1U << snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h index bf65f31af858..875a5fc13297 100644 --- a/sound/soc/sof/sof-audio.h +++ b/sound/soc/sof/sof-audio.h @@ -56,7 +56,7 @@ struct snd_sof_pcm { struct snd_sof_led_control { unsigned int use_led; unsigned int direction; - unsigned int led_value; + int led_value; }; /* ALSA SOF Kcontrol device */ diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index fe8ba3e05e08..ab2b69de1d4d 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1203,6 +1203,8 @@ static int sof_control_load(struct snd_soc_component *scomp, int index, return ret; } + scontrol->led_ctl.led_value = -1; + dobj->private = scontrol; list_add(&scontrol->list, &sdev->kcontrol_list); return ret; |