diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-29 21:03:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-29 21:03:20 +0100 |
| commit | 2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d (patch) | |
| tree | 72200e6f6f5877b35dab173ef47a463f98223dbb /sound/soc/soc-core.c | |
| parent | ASoC: ad193x: move codec register/unregister to bus probe/remove (diff) | |
| parent | ASoC: Fix passing platform_data to ac97 bus users and fix a leak (diff) | |
| download | linux-dev-2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d.tar.xz linux-dev-2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d.zip | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1ff553bbc063..d59076e2ca84 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1597,7 +1597,8 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid) mutex_unlock(&codec->mutex); return ret; } - if (card->dai_link[i].codec_dai->ac97_control) { + /* Check for codec->ac97 to handle the ac97.c fun */ + if (card->dai_link[i].codec_dai->ac97_control && codec->ac97) { snd_ac97_dev_add_pdata(codec->ac97, card->dai_link[i].cpu_dai->ac97_pdata); } |