ASoC: wm_adsp: round to 4-byte boundary for coeff file blocks

Signed-off-by: Chris Rattray <crattray@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index be45e2b8b59e..f3f7e75f8628 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -711,6 +711,7 @@ 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)
@@ -842,7 +843,12 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
                         }
                 }
 
-                pos += le32_to_cpu(blk->len) + sizeof(*blk);
+                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);
+
                 blocks++;
         }