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/tlv320aic3x.c | |
| parent | 3ab6123a48cdc1c66f6715e7f78c350369dd511f (diff) | |
| parent | 0ecfe7987855d21c2a89ffe003ddf0ee11b42d47 (diff) | |
Merge branch 'topic/asoc' into for-next
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 255e784c805b..0f4067bdd4a3 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1187,7 +1187,7 @@ static int aic3x_init(struct snd_soc_device *socdev) aic3x_add_controls(codec); aic3x_add_widgets(codec); - ret = snd_soc_register_card(socdev); + ret = snd_soc_init_card(socdev); if (ret < 0) { printk(KERN_ERR "aic3x: failed to register card\n"); goto card_err; |