summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Neuschäfer <j.neuschaefer@gmx.net>2011-12-11 19:15:49 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-12 05:44:02 +0100
commit62e4a13e602214908341fad068ff91f31aed1a4e (patch)
treee5536d6756c3f6066a8f228c9467910666ca25ab
parentASoC: mxs: Add appropriate MODULE_ALIAS() (diff)
downloadlinux-62e4a13e602214908341fad068ff91f31aed1a4e.tar.xz
linux-62e4a13e602214908341fad068ff91f31aed1a4e.zip
ASoC: WM8958: correctly show firmware magic on mismatch
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm8958-dsp2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index 0293763debe5..5a14d5c0e0e1 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -60,6 +60,8 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
}
if (memcmp(fw->data, "WMFW", 4) != 0) {
+ memcpy(&data32, fw->data, sizeof(data32));
+ data32 = be32_to_cpu(data32);
dev_err(codec->dev, "%s: firmware has bad file magic %08x\n",
name, data32);
goto err;