diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-15 15:38:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-15 15:38:26 +0200 |
| commit | 60befb97f5ab11037f1ae7563ca7137878a7bd46 (patch) | |
| tree | 135fd84011d6f75eccbb7647c9b03957a800ed99 /sound/soc/soc-core.c | |
| parent | a3d2b755c0e8f301c079d8aa5a761622259400fe (diff) | |
| parent | f492ec9f02908579353e31949855f86909a5af14 (diff) | |
Merge branch 'fix/asoc' into for-linus
* fix/asoc:
ASoC: DaVinci EVM board support buildfixes
ASoC: DaVinci I2S updates
ASoC: davinci-pcm buildfixes
pxa2xx-ac97: fix reset gpio mode setting
ASoC: soc-core: fix crash when removing not instantiated card
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 99712f652d0..1cd149b9ce6 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -954,6 +954,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) |