diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-12 10:53:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-12 10:53:33 +0100 |
| commit | 13e2c86c20f5d07b20d5a6dee24bcdd2b30b859f (patch) | |
| tree | aec938a433390ffed54a3ceee65c9583cb841802 | |
| parent | 97b8096dc92ae62b1d40e6bec7e7b257d2b30161 (diff) | |
| parent | 1ffafeb556d50de8039e14f1cbbe58e9e4549915 (diff) | |
| download | lwn-13e2c86c20f5d07b20d5a6dee24bcdd2b30b859f.tar.gz lwn-13e2c86c20f5d07b20d5a6dee24bcdd2b30b859f.zip | |
Merge branch 'for-2.6.30' into for-2.6.31
| -rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 2 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index a2c12d105c9a..6fdca97186e7 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 6ac68e47b3a6..c0e706645ec4 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) |