ASoC: SOF: Update correct LED status at the first time usage of update_mute_led() (49c22696) · Commits · 戴 / test

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: ("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>

sound/soc/sof/control.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

sound/soc/sof/sof-audio.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */

sound/soc/sof/topology.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;

Admin message