Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / sound / soc / soc-ops.c

diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
index 592efb370c44931854480559ea95851150ec2659..f4dc3d445aae9e128e2db6f85fac603c943398f1 100644 (file)
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -373,7 +373,7 @@ int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol,
        unsigned int rshift = mc->rshift;
        int max = mc->max;
        int min = mc->min;
-       unsigned int mask = (1 << (fls(min + max) - 1)) - 1;
+       unsigned int mask = (1U << (fls(min + max) - 1)) - 1;
        unsigned int val;
        int ret;
 
@@ -418,7 +418,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
        unsigned int rshift = mc->rshift;
        int max = mc->max;
        int min = mc->min;
-       unsigned int mask = (1 << (fls(min + max) - 1)) - 1;
+       unsigned int mask = (1U << (fls(min + max) - 1)) - 1;
        int err = 0;
        unsigned int val, val_mask, val2 = 0;