]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ASoC: core: Fix to check return value of snd_soc_update_bits_locked()
authorJoonyoung Shim <jy0922.shim@samsung.com>
Tue, 26 Mar 2013 05:41:05 +0000 (14:41 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Apr 2013 04:48:27 +0000 (21:48 -0700)
commit 0eaa6cca1f75e12e4f5ec62cbe887330fe3b5fe9 upstream.

It can be 0 or 1 return value of snd_soc_update_bits_locked() when it is
success. So just check return value is negative.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/soc-core.c

index 2370063b58245946f71adfa05f361097d3e53374..f3ab91865fa199a2a7abbeda0e2e2ec69034c977 100644 (file)
@@ -2959,7 +2959,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
        val = val << shift;
 
        ret = snd_soc_update_bits_locked(codec, reg, val_mask, val);
-       if (ret != 0)
+       if (ret < 0)
                return ret;
 
        if (snd_soc_volsw_is_stereo(mc)) {