diff options
Diffstat (limited to 'sound/soc/codecs/tlv320aic23.c')
-rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 6b24d8bb02bb..a091ce778108 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c | |||
@@ -395,7 +395,6 @@ static int tlv320aic23_add_widgets(struct snd_soc_codec *codec) | |||
395 | /* set up audio path interconnects */ | 395 | /* set up audio path interconnects */ |
396 | snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); | 396 | snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); |
397 | 397 | ||
398 | snd_soc_dapm_new_widgets(codec); | ||
399 | return 0; | 398 | return 0; |
400 | } | 399 | } |
401 | 400 | ||
@@ -707,17 +706,9 @@ static int tlv320aic23_init(struct snd_soc_device *socdev) | |||
707 | snd_soc_add_controls(codec, tlv320aic23_snd_controls, | 706 | snd_soc_add_controls(codec, tlv320aic23_snd_controls, |
708 | ARRAY_SIZE(tlv320aic23_snd_controls)); | 707 | ARRAY_SIZE(tlv320aic23_snd_controls)); |
709 | tlv320aic23_add_widgets(codec); | 708 | tlv320aic23_add_widgets(codec); |
710 | ret = snd_soc_init_card(socdev); | ||
711 | if (ret < 0) { | ||
712 | printk(KERN_ERR "tlv320aic23: failed to register card\n"); | ||
713 | goto card_err; | ||
714 | } | ||
715 | 709 | ||
716 | return ret; | 710 | return ret; |
717 | 711 | ||
718 | card_err: | ||
719 | snd_soc_free_pcms(socdev); | ||
720 | snd_soc_dapm_free(socdev); | ||
721 | pcm_err: | 712 | pcm_err: |
722 | kfree(codec->reg_cache); | 713 | kfree(codec->reg_cache); |
723 | return ret; | 714 | return ret; |