Commit 86b1f677 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/fix/adsp' into asoc-next

parents 8bb96604 f4b82812
...@@ -828,7 +828,8 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) ...@@ -828,7 +828,8 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
&buf_list); &buf_list);
if (!buf) { if (!buf) {
adsp_err(dsp, "Out of memory\n"); 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", adsp_dbg(dsp, "%s.%d: Writing %d bytes at %x\n",
...@@ -865,7 +866,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) ...@@ -865,7 +866,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
wm_adsp_buf_free(&buf_list); wm_adsp_buf_free(&buf_list);
out: out:
kfree(file); kfree(file);
return 0; return ret;
} }
int wm_adsp1_init(struct wm_adsp *adsp) int wm_adsp1_init(struct wm_adsp *adsp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment