commit 13e2c86c20f5d07b20d5a6dee24bcdd2b30b859f
author Mark Brown <broonie@opensource.wolfsonmicro.com> Tue May 12 10:53:33 2009 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> Tue May 12 10:53:33 2009 +0100
tree aec938a433390ffed54a3ceee65c9583cb841802
parent 97b8096dc92ae62b1d40e6bec7e7b257d2b30161
parent 1ffafeb556d50de8039e14f1cbbe58e9e4549915

Merge branch 'for-2.6.30' into for-2.6.31

sound/arm/pxa2xx-ac97-lib.c

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index a2c12d1..6fdca97 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -65,7 +65,7 @@
 		switch (resetgpio_action) {
 		case RESETGPIO_NORMAL_ALTFUNC:
 			if (reset_gpio == 113)
-				mode = 113 | GPIO_OUT | GPIO_DFLT_LOW;
+				mode = 113 | GPIO_ALT_FN_2_OUT;
 			if (reset_gpio == 95)
 				mode = 95 | GPIO_ALT_FN_1_OUT;
 			break;

sound/soc/soc-core.c

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6ac68e4..c0e7066 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -992,6 +992,9 @@
 	struct snd_soc_platform *platform = card->platform;
 	struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
 
+	if (!card->instantiated)
+		return 0;
+
 	run_delayed_work(&card->delayed_work);
 
 	if (platform->remove)