diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
commit | de8853bc38ceab1fa7e7f723b21430d4aad60fea (patch) | |
tree | 5084ef51866fd1767324f8dc8eb36e97c55350f5 /sound/soc/codecs/tlv320aic3x.c | |
parent | f5de24b06aa46427500d0fdbe8616b73a71d8c28 (diff) | |
parent | 440b004cf953bec2bc8cd91c64ae707fd7e25327 (diff) |
Merge remote branch 'alsa/fixes' into fix/hda
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
-rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 3395cf945d56..2b4dc2b0b017 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c | |||
@@ -753,7 +753,6 @@ static int aic3x_add_widgets(struct snd_soc_codec *codec) | |||
753 | /* set up audio path interconnects */ | 753 | /* set up audio path interconnects */ |
754 | snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); | 754 | snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); |
755 | 755 | ||
756 | snd_soc_dapm_new_widgets(codec); | ||
757 | return 0; | 756 | return 0; |
758 | } | 757 | } |
759 | 758 | ||
@@ -1405,18 +1404,8 @@ static int aic3x_probe(struct platform_device *pdev) | |||
1405 | 1404 | ||
1406 | aic3x_add_widgets(codec); | 1405 | aic3x_add_widgets(codec); |
1407 | 1406 | ||
1408 | ret = snd_soc_init_card(socdev); | ||
1409 | if (ret < 0) { | ||
1410 | printk(KERN_ERR "aic3x: failed to register card\n"); | ||
1411 | goto card_err; | ||
1412 | } | ||
1413 | |||
1414 | return ret; | 1407 | return ret; |
1415 | 1408 | ||
1416 | card_err: | ||
1417 | snd_soc_free_pcms(socdev); | ||
1418 | snd_soc_dapm_free(socdev); | ||
1419 | |||
1420 | pcm_err: | 1409 | pcm_err: |
1421 | kfree(codec->reg_cache); | 1410 | kfree(codec->reg_cache); |
1422 | return ret; | 1411 | return ret; |