diff --git a/[refs] b/[refs]
index 86588c8bb8ae..e2f79f81a413 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62e4a13e602214908341fad068ff91f31aed1a4e
+refs/heads/master: 497d496598f411cb7f0690725a0e8b9029cebdb9
diff --git a/trunk/sound/soc/pxa/hx4700.c b/trunk/sound/soc/pxa/hx4700.c
index 65c124831a00..c664e33fb6d7 100644
--- a/trunk/sound/soc/pxa/hx4700.c
+++ b/trunk/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)