diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 21:30:38 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 21:30:38 +0100 |
commit | 90b50a2c56954b01791357d68a86b00cc0947822 (patch) | |
tree | 63cae8afd0599db6c04aec338abde5a7310087dd /sound/soc/codecs/uda134x.c | |
parent | 3ab6123a48cdc1c66f6715e7f78c350369dd511f (diff) | |
parent | 0ecfe7987855d21c2a89ffe003ddf0ee11b42d47 (diff) |
Merge branch 'topic/asoc' into for-next
Diffstat (limited to 'sound/soc/codecs/uda134x.c')
-rw-r--r-- | sound/soc/codecs/uda134x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index 91f333cdc7cf..58de749185e6 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c @@ -578,7 +578,7 @@ static int uda134x_soc_probe(struct platform_device *pdev) goto pcm_err; } - ret = snd_soc_register_card(socdev); + ret = snd_soc_init_card(socdev); if (ret < 0) { printk(KERN_ERR "UDA134X: failed to register card\n"); goto card_err; |