diff --git a/[refs] b/[refs]
index 1d1dc8d6d5c9..d27fd3f09059 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc36681fdc3276b9da4047c277349291c4cbad09
+refs/heads/master: 977d49e00d18d500d0bfe77500053d9df9c3db77
diff --git a/trunk/sound/soc/codecs/tlv320aic3x.c b/trunk/sound/soc/codecs/tlv320aic3x.c
index 5d547675b853..3395cf945d56 100644
--- a/trunk/sound/soc/codecs/tlv320aic3x.c
+++ b/trunk/sound/soc/codecs/tlv320aic3x.c
@@ -1385,15 +1385,14 @@ static int aic3x_probe(struct platform_device *pdev)
 	socdev->card->codec = codec;
 	setup = socdev->codec_data;
 
-	if (!setup) {
-		dev_err(&pdev->dev, "No setup data supplied\n");
-		return -EINVAL;
+	if (setup) {
+		/* setup GPIO functions */
+		aic3x_write(codec, AIC3X_GPIO1_REG,
+			    (setup->gpio_func[0] & 0xf) << 4);
+		aic3x_write(codec, AIC3X_GPIO2_REG,
+			    (setup->gpio_func[1] & 0xf) << 4);
 	}
 
-	/* setup GPIO functions */
-	aic3x_write(codec, AIC3X_GPIO1_REG, (setup->gpio_func[0] & 0xf) << 4);
-	aic3x_write(codec, AIC3X_GPIO2_REG, (setup->gpio_func[1] & 0xf) << 4);
-
 	/* register pcms */
 	ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
 	if (ret < 0) {