[PATCH] ASoC: wm_adsp: Release firmware on error

[PATCH] ASoC: wm_adsp: Release firmware on error

[Charles Keepax]

This patch correctly releases the firmware if the magic string in the
firmware header does not match.

Change-Id: I2d08f7fff92b2f0e0f2ab1fb937007e3783f815e
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 sound/soc/codecs/wm_adsp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 4196f2d..b6b6548 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -396,7 +396,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
 	hdr = (void*)&firmware->data[0];
 	if (memcmp(hdr->magic, "WMDR", 4) != 0) {
 		adsp_err(dsp, "%s: invalid magic\n", file);
-		return -EINVAL;
+		goto out_fw;
 	}
 
 	adsp_dbg(dsp, "%s: v%d.%d.%d\n", file,
-- 
1.7.2.5

Re: [PATCH] ASoC: wm_adsp: Release firmware on error

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 444 bytes --]

On Mon, Jan 21, 2013 at 09:02:31AM +0000, Charles Keepax wrote:
> This patch correctly releases the firmware if the magic string in the
> firmware header does not match.
> 
> Change-Id: I2d08f7fff92b2f0e0f2ab1fb937007e3783f815e
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>

Applied but:
 - Don't include noise like Change-Ids in upstream submissions.
 - Always CC maintainers on patches (you've missed Liam).

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]