1 files changed, 6 insertions, 10 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index e5b0713e6f3c..9a6daf997319 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2413,16 +2413,14 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
-        unsigned int val, bitmask;
+        unsigned int val;
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         val = snd_soc_read(codec, e->reg);
         ucontrol->value.enumerated.item[0]
-                = (val >> e->shift_l) & (bitmask - 1);
+                = (val >> e->shift_l) & e->mask;
         if (e->shift_l != e->shift_r)
                 ucontrol->value.enumerated.item[1] =
-                        (val >> e->shift_r) & (bitmask - 1);
+                        (val >> e->shift_r) & e->mask;
 
         return 0;
 }
@@ -2443,19 +2441,17 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int val;
-        unsigned int mask, bitmask;
+        unsigned int mask;
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         if (ucontrol->value.enumerated.item[0] > e->max - 1)
                 return -EINVAL;
         val = ucontrol->value.enumerated.item[0] << e->shift_l;
-        mask = (bitmask - 1) << e->shift_l;
+        mask = e->mask << e->shift_l;
         if (e->shift_l != e->shift_r) {
                 if (ucontrol->value.enumerated.item[1] > e->max - 1)
                         return -EINVAL;
                 val |= ucontrol->value.enumerated.item[1] << e->shift_r;
-                mask |= (bitmask - 1) << e->shift_r;
+                mask |= e->mask << e->shift_r;
         }
 
         return snd_soc_update_bits_locked(codec, e->reg, mask, val);