diff options
Diffstat (limited to 'sound/soc/codecs/ssm2602.c')
| -rw-r--r-- | sound/soc/codecs/ssm2602.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index c550750c79c0..d2ff1cde6883 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c | |||
| @@ -210,7 +210,6 @@ static int ssm2602_add_widgets(struct snd_soc_codec *codec) | |||
| 210 | 210 | ||
| 211 | snd_soc_dapm_add_routes(codec, audio_conn, ARRAY_SIZE(audio_conn)); | 211 | snd_soc_dapm_add_routes(codec, audio_conn, ARRAY_SIZE(audio_conn)); |
| 212 | 212 | ||
| 213 | snd_soc_dapm_new_widgets(codec); | ||
| 214 | return 0; | 213 | return 0; |
| 215 | } | 214 | } |
| 216 | 215 | ||
| @@ -613,17 +612,9 @@ static int ssm2602_init(struct snd_soc_device *socdev) | |||
| 613 | snd_soc_add_controls(codec, ssm2602_snd_controls, | 612 | snd_soc_add_controls(codec, ssm2602_snd_controls, |
| 614 | ARRAY_SIZE(ssm2602_snd_controls)); | 613 | ARRAY_SIZE(ssm2602_snd_controls)); |
| 615 | ssm2602_add_widgets(codec); | 614 | ssm2602_add_widgets(codec); |
| 616 | ret = snd_soc_init_card(socdev); | ||
| 617 | if (ret < 0) { | ||
| 618 | pr_err("ssm2602: failed to register card\n"); | ||
| 619 | goto card_err; | ||
| 620 | } | ||
| 621 | 615 | ||
| 622 | return ret; | 616 | return ret; |
| 623 | 617 | ||
| 624 | card_err: | ||
| 625 | snd_soc_free_pcms(socdev); | ||
| 626 | snd_soc_dapm_free(socdev); | ||
| 627 | pcm_err: | 618 | pcm_err: |
| 628 | kfree(codec->reg_cache); | 619 | kfree(codec->reg_cache); |
| 629 | return ret; | 620 | return ret; |
