diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-08-19 15:51:30 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-19 10:59:48 -0500 |
| commit | c5599b87a8317738a541d8893cb327df5d04b007 (patch) | |
| tree | ee4241c8274d656de11921ff596bfdb0bdaeef1e | |
| parent | 75af7c081982d76cef0daf26e96b5d1e8cb9d631 (diff) | |
| download | blackbird-op-linux-c5599b87a8317738a541d8893cb327df5d04b007.tar.gz blackbird-op-linux-c5599b87a8317738a541d8893cb327df5d04b007.zip | |
ASoC: Replace list_empty(&card->codec_dev_list) with !card->instantiated
With componentization we no longer necessarily need a snd_soc_codec struct for a
card. Instead of checking if the card's CODEC list is empty just use
card->instantiated to check if the card has been instantiated yet.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/soc-core.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2d7a9ecbb0e3..c36983a133fa 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -552,10 +552,8 @@ int snd_soc_suspend(struct device *dev) struct snd_soc_codec *codec; int i, j; - /* 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)) + /* If the card is not initialized yet there is nothing to do */ + if (!card->instantiated) return 0; /* Due to the resume being scheduled into a workqueue we could @@ -808,10 +806,8 @@ 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)) + /* If the card is not initialized yet there is nothing to do */ + if (!card->instantiated) return 0; /* activate pins from sleep state */ |
