diff options
Diffstat (limited to 'sound/soc/codecs/wm9705.c')
-rw-r--r-- | sound/soc/codecs/wm9705.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index e7d2840d9e59..8793341849d1 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c | |||
@@ -10,6 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <linux/slab.h> | ||
13 | #include <linux/module.h> | 14 | #include <linux/module.h> |
14 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
15 | #include <linux/device.h> | 16 | #include <linux/device.h> |
@@ -205,7 +206,6 @@ static int wm9705_add_widgets(struct snd_soc_codec *codec) | |||
205 | snd_soc_dapm_new_controls(codec, wm9705_dapm_widgets, | 206 | snd_soc_dapm_new_controls(codec, wm9705_dapm_widgets, |
206 | ARRAY_SIZE(wm9705_dapm_widgets)); | 207 | ARRAY_SIZE(wm9705_dapm_widgets)); |
207 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 208 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); |
208 | snd_soc_dapm_new_widgets(codec); | ||
209 | 209 | ||
210 | return 0; | 210 | return 0; |
211 | } | 211 | } |
@@ -403,12 +403,6 @@ static int wm9705_soc_probe(struct platform_device *pdev) | |||
403 | ARRAY_SIZE(wm9705_snd_ac97_controls)); | 403 | ARRAY_SIZE(wm9705_snd_ac97_controls)); |
404 | wm9705_add_widgets(codec); | 404 | wm9705_add_widgets(codec); |
405 | 405 | ||
406 | ret = snd_soc_init_card(socdev); | ||
407 | if (ret < 0) { | ||
408 | printk(KERN_ERR "wm9705: failed to register card\n"); | ||
409 | goto reset_err; | ||
410 | } | ||
411 | |||
412 | return 0; | 406 | return 0; |
413 | 407 | ||
414 | reset_err: | 408 | reset_err: |