diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-12 04:59:06 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-12 04:59:06 (GMT) |
| commit | 0a105ddb35aa702d975cb902d8d2c0cde4f1f231 (patch) | |
| tree | 54a33153792a400753d627652a008131403c2fc8 /sound/soc | |
| parent | 43a95197581ac58081772eab3bd5f114da87f98b (diff) | |
| parent | 497d496598f411cb7f0690725a0e8b9029cebdb9 (diff) | |
| download | linux-fsl-qoriq-0a105ddb35aa702d975cb902d8d2c0cde4f1f231.tar.xz | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8958-dsp2.c | 2 | ||||
| -rw-r--r-- | sound/soc/pxa/hx4700.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c index 39e9557..8d4ea43 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; diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c index e32afaf..03ef9f3 100644 --- a/sound/soc/pxa/hx4700.c +++ b/sound/soc/pxa/hx4700.c @@ -209,9 +209,10 @@ static int __devinit hx4700_audio_probe(struct platform_device *pdev) snd_soc_card_hx4700.dev = &pdev->dev; ret = snd_soc_register_card(&snd_soc_card_hx4700); if (ret) - return ret; + gpio_free_array(hx4700_audio_gpios, + ARRAY_SIZE(hx4700_audio_gpios)); - return 0; + return ret; } static int __devexit hx4700_audio_remove(struct platform_device *pdev) |