From: Peter Ujfalusi Date: Mon, 22 Feb 2010 11:27:13 +0000 (+0200) Subject: ASoC: core: On resume also check the soc device state X-Git-Tag: MMI-PSA29.97-13-9~24353^2~7^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9dd94a87e5b4d0e864636698931aeeeb3c9d770;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ASoC: core: On resume also check the soc device state Check the card->codec on soc_resume to detect if the soc device is properly initialized. If the card->codec is NULL, than do not continue the resume operation, since the device is not initialized properly. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e1c0336868e1..a03bac943aaf 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -963,6 +963,12 @@ static int soc_resume(struct device *dev) struct snd_soc_card *card = socdev->card; struct snd_soc_dai *cpu_dai = card->dai_link[0].cpu_dai; + /* If the initialization of this soc device failed, there is no codec + * associated with it. Just bail out in this case. + */ + if (!card->codec) + 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