diff options
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 a5d3685a5d3..a25fa63ce9a 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  |