lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-2.6.30' into for-2.6.31

Browse Source
This commit is contained in:
Mark Brown
2009-05-12 10:53:33 +01:00
parent 97b8096dc9 1ffafeb556
commit 13e2c86c20
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/soc-core.c
View File

@@ -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)