diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-05 15:59:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-05 15:59:56 -0800 |
| commit | f843b0fcc70094d87fea8c7004937388c316ea7a (patch) | |
| tree | 00f76db04a4127a62fe1afe6d863d96d96e05226 /sound/soc/codecs/ac97.c | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
| parent | ecbec242961ec66e900b5649ded1e40f5d5edc41 (diff) | |
| download | blackbird-op-linux-f843b0fcc70094d87fea8c7004937388c316ea7a.tar.gz blackbird-op-linux-f843b0fcc70094d87fea8c7004937388c316ea7a.zip | |
Merge branch 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6
* 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6:
ASoC: fixup oops in generic AC97 codec glue
ASoC: fix params_rate() macro use in several codecs
ASoC: fsi-ak4642: Remove ak4642_add_i2c_device
Diffstat (limited to 'sound/soc/codecs/ac97.c')
| -rw-r--r-- | sound/soc/codecs/ac97.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index 69bd0acc81c8..a1bbe16b7f96 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c @@ -102,6 +102,12 @@ static int ac97_soc_probe(struct platform_device *pdev) INIT_LIST_HEAD(&codec->dapm_widgets); INIT_LIST_HEAD(&codec->dapm_paths); + ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); + if (ret < 0) { + printk(KERN_ERR "ASoC: failed to init gen ac97 glue\n"); + goto err; + } + /* register pcms */ ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); if (ret < 0) |
