diff options
Diffstat (limited to 'sound/soc/codecs/uda1380.c')
-rw-r--r-- | sound/soc/codecs/uda1380.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 92ec03442154..a2763c2e7348 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c | |||
@@ -378,7 +378,6 @@ static int uda1380_add_widgets(struct snd_soc_codec *codec) | |||
378 | 378 | ||
379 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 379 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); |
380 | 380 | ||
381 | snd_soc_dapm_new_widgets(codec); | ||
382 | return 0; | 381 | return 0; |
383 | } | 382 | } |
384 | 383 | ||
@@ -713,17 +712,9 @@ static int uda1380_probe(struct platform_device *pdev) | |||
713 | snd_soc_add_controls(codec, uda1380_snd_controls, | 712 | snd_soc_add_controls(codec, uda1380_snd_controls, |
714 | ARRAY_SIZE(uda1380_snd_controls)); | 713 | ARRAY_SIZE(uda1380_snd_controls)); |
715 | uda1380_add_widgets(codec); | 714 | uda1380_add_widgets(codec); |
716 | ret = snd_soc_init_card(socdev); | ||
717 | if (ret < 0) { | ||
718 | dev_err(codec->dev, "failed to register card: %d\n", ret); | ||
719 | goto card_err; | ||
720 | } | ||
721 | 715 | ||
722 | return ret; | 716 | return ret; |
723 | 717 | ||
724 | card_err: | ||
725 | snd_soc_free_pcms(socdev); | ||
726 | snd_soc_dapm_free(socdev); | ||
727 | pcm_err: | 718 | pcm_err: |
728 | return ret; | 719 | return ret; |
729 | } | 720 | } |