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>

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index be45e2b8b59eff5088aee7009a12a334bd5fef8b..f3f7e75f86280ef5160facc2a7f3cfa7972c6b91 100644 (file)
--- 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++;
        }