From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 3 May 2011 17:25:34 +0000 (+0100)
Subject: ASoC: Don't crash on PM operations
X-Git-Tag: latest~33^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed77cc122a8402db8f9c3492649aa0c3fee7b385;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

ASoC: Don't crash on PM operations

The move over to exposing snd_soc_register_card() let the initialisation
of the driver data we use to find the card in PM operations go AWOL. Fix
this by setting the driver data when we register the card.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index d8562ce..dd55d10 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3291,6 +3291,8 @@ int snd_soc_register_card(struct snd_soc_card *card)
 	if (!card->name || !card->dev)
 		return -EINVAL;
 
+	dev_set_drvdata(card->dev, card);
+
 	snd_soc_initialize_card_lists(card);
 
 	soc_init_card_debugfs(card);