aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-05-12 10:53:33 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-05-12 10:53:33 +0100
commit13e2c86c20f5d07b20d5a6dee24bcdd2b30b859f (patch)
treeaec938a433390ffed54a3ceee65c9583cb841802 /sound
parent97b8096dc92ae62b1d40e6bec7e7b257d2b30161 (diff)
parent1ffafeb556d50de8039e14f1cbbe58e9e4549915 (diff)
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound')
-rw-r--r--sound/arm/pxa2xx-ac97-lib.c2
-rw-r--r--sound/soc/soc-core.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index a2c12d105c9..6fdca97186e 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -65,7 +65,7 @@ static void set_resetgpio_mode(int resetgpio_action)
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;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6ac68e47b3a..c0e706645ec 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -992,6 +992,9 @@ static int soc_remove(struct platform_device *pdev)
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)