leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: SOF: Update correct LED status at the first time usage of update_mute_led()

Browse Source 
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: 5d43001ae4 ("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>
This commit is contained in:
Kai-Heng Feng 2020-04-30 17:11:39 +08:00 committed by Mark Brown
parent 8382f2949a
commit 49c2269634
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/sof/control.c
View File

@ -19,8 +19,8 @@ static void update_mute_led(struct snd_sof_control *scontrol,
struct snd_kcontrol *kcontrol, struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
unsigned int temp = 0; int temp = 0;
unsigned int mask; int mask;
int i; int i;
mask = 1U << snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); mask = 1U << snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);

2
sound/soc/sof/sof-audio.h
View File

@ -56,7 +56,7 @@ struct snd_sof_pcm {
struct snd_sof_led_control { struct snd_sof_led_control {
unsigned int use_led; unsigned int use_led;
unsigned int direction; unsigned int direction;
unsigned int led_value; int led_value;
}; };
/* ALSA SOF Kcontrol device */ /* ALSA SOF Kcontrol device */

2
sound/soc/sof/topology.c
View File

@ -1203,6 +1203,8 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,
return ret; return ret;
} }
scontrol->led_ctl.led_value = -1;
dobj->private = scontrol; dobj->private = scontrol;
list_add(&scontrol->list, &sdev->kcontrol_list); list_add(&scontrol->list, &sdev->kcontrol_list);
return ret; return ret;