Merge commit 'v2.6.29' into x86/setup-lzma

[linux-2.6-omap-h63xx.git] / sound / soc / codecs / ad1980.c

diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index a9a268112d3f45e37a97cad43eb279621d3279d2..73fdbb4d4a3d4702cbf6d9b3b25d59d00a287e2b 100644 (file)
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -270,7 +270,7 @@ static int ad1980_soc_probe(struct platform_device *pdev)
        ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800);
 
        ad1980_add_controls(codec);
-       ret = snd_soc_register_card(socdev);
+       ret = snd_soc_init_card(socdev);
        if (ret < 0) {
                printk(KERN_ERR "ad1980: failed to register card\n");
                goto reset_err;