diff options
Diffstat (limited to 'sound/soc/codecs/wm8750.c')
-rw-r--r-- | sound/soc/codecs/wm8750.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 4ba1e7e93fb4..2916ed4d3844 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/spi/spi.h> | 22 | #include <linux/spi/spi.h> |
23 | #include <linux/slab.h> | ||
23 | #include <sound/core.h> | 24 | #include <sound/core.h> |
24 | #include <sound/pcm.h> | 25 | #include <sound/pcm.h> |
25 | #include <sound/pcm_params.h> | 26 | #include <sound/pcm_params.h> |
@@ -403,7 +404,6 @@ static int wm8750_add_widgets(struct snd_soc_codec *codec) | |||
403 | 404 | ||
404 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 405 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); |
405 | 406 | ||
406 | snd_soc_dapm_new_widgets(codec); | ||
407 | return 0; | 407 | return 0; |
408 | } | 408 | } |
409 | 409 | ||
@@ -772,16 +772,8 @@ static int wm8750_init(struct snd_soc_device *socdev, | |||
772 | snd_soc_add_controls(codec, wm8750_snd_controls, | 772 | snd_soc_add_controls(codec, wm8750_snd_controls, |
773 | ARRAY_SIZE(wm8750_snd_controls)); | 773 | ARRAY_SIZE(wm8750_snd_controls)); |
774 | wm8750_add_widgets(codec); | 774 | wm8750_add_widgets(codec); |
775 | ret = snd_soc_init_card(socdev); | ||
776 | if (ret < 0) { | ||
777 | printk(KERN_ERR "wm8750: failed to register card\n"); | ||
778 | goto card_err; | ||
779 | } | ||
780 | return ret; | 775 | return ret; |
781 | 776 | ||
782 | card_err: | ||
783 | snd_soc_free_pcms(socdev); | ||
784 | snd_soc_dapm_free(socdev); | ||
785 | err: | 777 | err: |
786 | kfree(codec->reg_cache); | 778 | kfree(codec->reg_cache); |
787 | return ret; | 779 | return ret; |