2 files changed, 5 insertions, 2 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;
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index e32afaf1ebbb..03ef9f393434 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)