Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 983a150a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents 193b2f3f 5ff1ddf2
Loading
Loading
Loading
Loading
+6 −0
Original line number Original line Diff line number Diff line
@@ -709,6 +709,12 @@ int snd_soc_resume(struct device *dev)
	struct snd_soc_card *card = dev_get_drvdata(dev);
	struct snd_soc_card *card = dev_get_drvdata(dev);
	int i, ac97_control = 0;
	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
	/* AC97 devices might have other drivers hanging off them so
	 * need to resume immediately.  Other drivers don't have that
	 * need to resume immediately.  Other drivers don't have that
	 * problem and may take a substantial amount of time to resume
	 * problem and may take a substantial amount of time to resume