1 files changed, 3 insertions, 10 deletions

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index ff67b334065b..d01c2095452f 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -420,10 +420,9 @@ static int wm_coeff_put(struct snd_kcontrol *kcontrol,
 
         memcpy(ctl->cache, p, ctl->len);
 
-        if (!ctl->enabled) {
-                ctl->set = 1;
+        ctl->set = 1;
+        if (!ctl->enabled)
                 return 0;
-        }
 
         return wm_coeff_write_control(kcontrol, p, ctl->len);
 }
@@ -1185,7 +1184,6 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
         int ret, pos, blocks, type, offset, reg;
         char *file;
         struct wm_adsp_buf *buf;
-        int tmp;
 
         file = kzalloc(PAGE_SIZE, GFP_KERNEL);
         if (file == NULL)
@@ -1335,12 +1333,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
                         }
                 }
 
-                tmp = le32_to_cpu(blk->len) % 4;
-                if (tmp)
-                        pos += le32_to_cpu(blk->len) + (4 - tmp) + sizeof(*blk);
-                else
-                        pos += le32_to_cpu(blk->len) + sizeof(*blk);
-
+                pos += (le32_to_cpu(blk->len) + sizeof(*blk) + 3) & ~0x03;
                 blocks++;
         }