summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-12 05:59:06 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-12 05:59:06 +0100
commit0a105ddb35aa702d975cb902d8d2c0cde4f1f231 (patch)
tree54a33153792a400753d627652a008131403c2fc8 /sound/soc/codecs
parentMerge branch 'for-3.2' into for-3.3 (diff)
parentASoC: Fix hx4700 error handling to free gpios if snd_soc_register_card fails (diff)
downloadlinux-0a105ddb35aa702d975cb902d8d2c0cde4f1f231.tar.xz
linux-0a105ddb35aa702d975cb902d8d2c0cde4f1f231.zip
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs')
-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 39e9557bdfd7..8d4ea43d40a3 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -61,6 +61,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;