diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 11:06:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 11:06:56 -0400 |
| commit | c244450dac6d83be1ceadf29a65a5b49c34ceed8 (patch) | |
| tree | 14741f05d136df2da0f1a01c7a6085fc8b864322 /sound/soc/soc-core.c | |
| parent | ade385e4d14f4158b3b27acd992a98bca4cd7f23 (diff) | |
| parent | 60befb97f5ab11037f1ae7563ca7137878a7bd46 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: DaVinci EVM board support buildfixes
ASoC: DaVinci I2S updates
ASoC: davinci-pcm buildfixes
ALSA: pcsp: fix printk format warning
ALSA: riptide: postfix increment and off by one
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 99712f652d0d..1cd149b9ce69 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) | |||
| 954 | struct snd_soc_platform *platform = card->platform; | 954 | struct snd_soc_platform *platform = card->platform; |
| 955 | struct snd_soc_codec_device *codec_dev = socdev->codec_dev; | 955 | struct snd_soc_codec_device *codec_dev = socdev->codec_dev; |
| 956 | 956 | ||
| 957 | if (!card->instantiated) | ||
| 958 | return 0; | ||
| 959 | |||
| 957 | run_delayed_work(&card->delayed_work); | 960 | run_delayed_work(&card->delayed_work); |
| 958 | 961 | ||
| 959 | if (platform->remove) | 962 | if (platform->remove) |