lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 160/388] ASoC: SOF: Update correct LED status at the first time usage of update_mute_led()
    Date
    From: Kai-Heng Feng <kai.heng.feng@canonical.com>

    [ Upstream commit 49c22696348d6e7c8a2ecfd7e60fddfe188ded82 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/sof/control.c | 4 ++--
    sound/soc/sof/sof-audio.h | 2 +-
    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;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 03:12    [W:2.199 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site