diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-03 18:25:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-03 23:28:04 +0100 |
| commit | ed77cc122a8402db8f9c3492649aa0c3fee7b385 (patch) | |
| tree | 6223f0d61de0f406c1453d6a063196512dd3c2a6 /sound | |
| parent | ASoC: JZ4740: Fix i2s shutdown (diff) | |
| download | linux-dev-ed77cc122a8402db8f9c3492649aa0c3fee7b385.tar.xz linux-dev-ed77cc122a8402db8f9c3492649aa0c3fee7b385.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d8562ce4de7a..dd55d1069468 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); |