diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:41 +0100 |
| commit | baf9226667734579e344f612ed39f727079cad51 (patch) | |
| tree | 9744efb5f1838ea73b695a0ab862547fdcf92ecf /sound/soc/codecs/tlv320aic23.c | |
| parent | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (diff) | |
| parent | 43f0de8d0298e624e6c3bf2185b6003a59b331bd (diff) | |
| download | linux-baf9226667734579e344f612ed39f727079cad51.tar.bz2 | |
Merge branch 'topic/asoc' into for-linus
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 58ffb6de400f..a9dc5fb54774 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) /* set up audio path interconnects */ snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); - snd_soc_dapm_new_widgets(codec); return 0; } @@ -706,17 +705,9 @@ static int tlv320aic23_init(struct snd_soc_device *socdev) snd_soc_add_controls(codec, tlv320aic23_snd_controls, ARRAY_SIZE(tlv320aic23_snd_controls)); tlv320aic23_add_widgets(codec); - ret = snd_soc_init_card(socdev); - if (ret < 0) { - printk(KERN_ERR "tlv320aic23: failed to register card\n"); - goto card_err; - } return ret; -card_err: - snd_soc_free_pcms(socdev); - snd_soc_dapm_free(socdev); pcm_err: kfree(codec->reg_cache); return ret; |