lkml.org 
[lkml]   [2021]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 078/132] ASoC: codecs: wsa881x: fix return values from kcontrol put
    Date
    From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

    commit 3fc27e9a1f619b50700f020e6cd270c1b74755f0 upstream.

    wsa881x_set_port() and wsa881x_put_pa_gain() currently returns zero eventhough
    it changes the value. Fix this, so that change notifications are sent
    correctly.

    Fixes: a0aab9e1404a ("ASoC: codecs: add wsa881x amplifier support")
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Link: https://lore.kernel.org/r/20211130160507.22180-5-srinivas.kandagatla@linaro.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/soc/codecs/wsa881x.c | 16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

    --- a/sound/soc/codecs/wsa881x.c
    +++ b/sound/soc/codecs/wsa881x.c
    @@ -772,7 +772,8 @@ static int wsa881x_put_pa_gain(struct sn

    usleep_range(1000, 1010);
    }
    - return 0;
    +
    + return 1;
    }

    static int wsa881x_get_port(struct snd_kcontrol *kcontrol,
    @@ -816,15 +817,22 @@ static int wsa881x_set_port(struct snd_k
    (struct soc_mixer_control *)kcontrol->private_value;
    int portidx = mixer->reg;

    - if (ucontrol->value.integer.value[0])
    + if (ucontrol->value.integer.value[0]) {
    + if (data->port_enable[portidx])
    + return 0;
    +
    data->port_enable[portidx] = true;
    - else
    + } else {
    + if (!data->port_enable[portidx])
    + return 0;
    +
    data->port_enable[portidx] = false;
    + }

    if (portidx == WSA881X_PORT_BOOST) /* Boost Switch */
    wsa881x_boost_ctrl(comp, data->port_enable[portidx]);

    - return 0;
    + return 1;
    }

    static const char * const smart_boost_lvl_text[] = {

    \
     
     \ /
      Last update: 2021-12-13 11:10    [W:3.788 / U:0.788 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site