diff options
Diffstat (limited to 'sound/soc/codecs/ak4535.c')
-rw-r--r-- | sound/soc/codecs/ak4535.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index 0abec0d29a96..ff966567e2ba 100644 --- a/sound/soc/codecs/ak4535.c +++ b/sound/soc/codecs/ak4535.c | |||
@@ -294,7 +294,6 @@ static int ak4535_add_widgets(struct snd_soc_codec *codec) | |||
294 | 294 | ||
295 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 295 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); |
296 | 296 | ||
297 | snd_soc_dapm_new_widgets(codec); | ||
298 | return 0; | 297 | return 0; |
299 | } | 298 | } |
300 | 299 | ||
@@ -485,17 +484,9 @@ static int ak4535_init(struct snd_soc_device *socdev) | |||
485 | snd_soc_add_controls(codec, ak4535_snd_controls, | 484 | snd_soc_add_controls(codec, ak4535_snd_controls, |
486 | ARRAY_SIZE(ak4535_snd_controls)); | 485 | ARRAY_SIZE(ak4535_snd_controls)); |
487 | ak4535_add_widgets(codec); | 486 | ak4535_add_widgets(codec); |
488 | ret = snd_soc_init_card(socdev); | ||
489 | if (ret < 0) { | ||
490 | printk(KERN_ERR "ak4535: failed to register card\n"); | ||
491 | goto card_err; | ||
492 | } | ||
493 | 487 | ||
494 | return ret; | 488 | return ret; |
495 | 489 | ||
496 | card_err: | ||
497 | snd_soc_free_pcms(socdev); | ||
498 | snd_soc_dapm_free(socdev); | ||
499 | pcm_err: | 490 | pcm_err: |
500 | kfree(codec->reg_cache); | 491 | kfree(codec->reg_cache); |
501 | 492 | ||