diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 14:58:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 14:58:37 +0000 |
| commit | 983a150a12f8cf729784d3118b25a757f8cbe46a (patch) | |
| tree | 2eb70d5a211150dfe68c47f6199ca7c4e21d1268 /sound/soc/soc-core.c | |
| parent | 193b2f3f53690ca1f7409340dd9e63fcac1f6277 (diff) | |
| parent | 5ff1ddf22b2584d00d7e0ba5a8eab07b5338bd84 (diff) | |
| download | linux-983a150a12f8cf729784d3118b25a757f8cbe46a.tar.gz linux-983a150a12f8cf729784d3118b25a757f8cbe46a.tar.bz2 linux-983a150a12f8cf729784d3118b25a757f8cbe46a.zip | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index bf41d9071f1e..b194842c4cc3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -709,6 +709,12 @@ int snd_soc_resume(struct device *dev) struct snd_soc_card *card = dev_get_drvdata(dev); int i, ac97_control = 0; + /* If the initialization of this soc device failed, there is no codec + * associated with it. Just bail out in this case. + */ + if (list_empty(&card->codec_dev_list)) + return 0; + /* AC97 devices might have other drivers hanging off them so * need to resume immediately. Other drivers don't have that * problem and may take a substantial amount of time to resume |