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

gunnarahlberg · Mar 26, 2013 · 86b1f67 · 86b1f67
2 parents 8bb9660 + f4b8281
commit 86b1f67
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
 	wm_adsp_buf_free(&buf_list);
 out:
 	kfree(file);
-	return 0;
+	return ret;
 }
 
 int wm_adsp1_init(struct wm_adsp *adsp)