ASoC: codecs: wcd934x: fix return value of wcd934x_rx_hph_mode_put
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tue, 22 Feb 2022 18:32:12 +0000 (18:32 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:23:18 +0000 (14:23 +0200)
[ Upstream commit 4b0bec6088588a120d33db85b1f0d9f096d1df71 ]

wcd934x_rx_hph_mode_put currently returns zero eventhough it changes the value.
Fix this, so that change notifications are sent correctly.

Fixes: 1cde8b822332 ("ASoC: wcd934x: add basic controls")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220222183212.11580-10-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/wcd934x.c

index 68c9d694d379b03c6126e5be186c1bdcad7de1d8..654d847a050e6f10f4e0ea5fa34506ae3aabc7d7 100644 (file)
@@ -3308,13 +3308,16 @@ static int wcd934x_rx_hph_mode_put(struct snd_kcontrol *kc,
 
        mode_val = ucontrol->value.enumerated.item[0];
 
+       if (mode_val == wcd->hph_mode)
+               return 0;
+
        if (mode_val == 0) {
                dev_err(wcd->dev, "Invalid HPH Mode, default to ClSH HiFi\n");
                mode_val = CLS_H_LOHIFI;
        }
        wcd->hph_mode = mode_val;
 
-       return 0;
+       return 1;
 }
 
 static int slim_rx_mux_get(struct snd_kcontrol *kc,