diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 14:07:56 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 14:07:56 +0000 |
| commit | 86b1f677065be93e492da3bd2d791c594c05620d (patch) | |
| tree | 57923439853b6cb9dbccf95b7886e30417ec3941 /sound | |
| parent | 8bb9660418e05bb1845ac1a2428444d78e322cc7 (diff) | |
| parent | f4b828128ab64fd9dc5eec9525b38fbfeafa5c0e (diff) | |
| download | linux-86b1f677065be93e492da3bd2d791c594c05620d.tar.gz linux-86b1f677065be93e492da3bd2d791c594c05620d.tar.bz2 linux-86b1f677065be93e492da3bd2d791c594c05620d.zip | |
Merge remote-tracking branch 'asoc/fix/adsp' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index f3f7e75f8628..9af1bddc4c62 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -828,7 +828,8 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) &buf_list); if (!buf) { adsp_err(dsp, "Out of memory\n"); - return -ENOMEM; + ret = -ENOMEM; + goto out_fw; } adsp_dbg(dsp, "%s.%d: Writing %d bytes at %x\n", @@ -865,7 +866,7 @@ out_fw: wm_adsp_buf_free(&buf_list); out: kfree(file); - return 0; + return ret; } int wm_adsp1_init(struct wm_adsp *adsp) |