OSDN Git Service

ASoC: rt1015: save boost_mode only if valid
authorTzung-Bi Shih <tzungbi@google.com>
Thu, 24 Dec 2020 10:06:04 +0000 (18:06 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 29 Dec 2020 13:18:46 +0000 (13:18 +0000)
Saves boost_mode only if valid.  Also returns -EINVAL if it is invalid.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20201224100607.3006171-3-tzungbi@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt1015.c

index e78364f..3b9db3a 100644 (file)
@@ -444,10 +444,9 @@ static int rt1015_boost_mode_put(struct snd_kcontrol *kcontrol,
                snd_soc_kcontrol_component(kcontrol);
        struct rt1015_priv *rt1015 =
                snd_soc_component_get_drvdata(component);
+       int boost_mode = ucontrol->value.integer.value[0];
 
-       rt1015->boost_mode = ucontrol->value.integer.value[0];
-
-       switch (rt1015->boost_mode) {
+       switch (boost_mode) {
        case BYPASS:
                snd_soc_component_update_bits(component,
                        RT1015_SMART_BST_CTRL1, RT1015_ABST_AUTO_EN_MASK |
@@ -471,8 +470,11 @@ static int rt1015_boost_mode_put(struct snd_kcontrol *kcontrol,
                break;
        default:
                dev_err(component->dev, "Unknown boost control.\n");
+               return -EINVAL;
        }
 
+       rt1015->boost_mode = boost_mode;
+
        return 0;
 }