diff options
Diffstat (limited to 'sound/soc/codecs/cx20442.c')
-rw-r--r-- | sound/soc/codecs/cx20442.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c index 38eac9c866e1..9f169c477108 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c | |||
@@ -14,6 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/tty.h> | 16 | #include <linux/tty.h> |
17 | #include <linux/slab.h> | ||
17 | 18 | ||
18 | #include <sound/core.h> | 19 | #include <sound/core.h> |
19 | #include <sound/initval.h> | 20 | #include <sound/initval.h> |
@@ -93,7 +94,6 @@ static int cx20442_add_widgets(struct snd_soc_codec *codec) | |||
93 | snd_soc_dapm_add_routes(codec, cx20442_audio_map, | 94 | snd_soc_dapm_add_routes(codec, cx20442_audio_map, |
94 | ARRAY_SIZE(cx20442_audio_map)); | 95 | ARRAY_SIZE(cx20442_audio_map)); |
95 | 96 | ||
96 | snd_soc_dapm_new_widgets(codec); | ||
97 | return 0; | 97 | return 0; |
98 | } | 98 | } |
99 | 99 | ||
@@ -355,17 +355,6 @@ static int cx20442_codec_probe(struct platform_device *pdev) | |||
355 | 355 | ||
356 | cx20442_add_widgets(codec); | 356 | cx20442_add_widgets(codec); |
357 | 357 | ||
358 | ret = snd_soc_init_card(socdev); | ||
359 | if (ret < 0) { | ||
360 | dev_err(&pdev->dev, "failed to register card\n"); | ||
361 | goto card_err; | ||
362 | } | ||
363 | |||
364 | return ret; | ||
365 | |||
366 | card_err: | ||
367 | snd_soc_free_pcms(socdev); | ||
368 | snd_soc_dapm_free(socdev); | ||
369 | pcm_err: | 358 | pcm_err: |
370 | return ret; | 359 | return ret; |
371 | } | 360 | } |