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

This commit is contained in:
Mark Brown 2013-03-26 14:07:56 +00:00
commit 86b1f67706

View File

@ -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 @@ out_fw:
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)