diff options
Diffstat (limited to 'sound/soc/codecs/ak4535.c')
-rw-r--r-- | sound/soc/codecs/ak4535.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index 0abec0d29a96..352d1d08dbd9 100644 --- a/sound/soc/codecs/ak4535.c +++ b/sound/soc/codecs/ak4535.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/pm.h> | 19 | #include <linux/pm.h> |
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/slab.h> | ||
22 | #include <sound/core.h> | 23 | #include <sound/core.h> |
23 | #include <sound/pcm.h> | 24 | #include <sound/pcm.h> |
24 | #include <sound/pcm_params.h> | 25 | #include <sound/pcm_params.h> |
@@ -294,7 +295,6 @@ static int ak4535_add_widgets(struct snd_soc_codec *codec) | |||
294 | 295 | ||
295 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 296 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); |
296 | 297 | ||
297 | snd_soc_dapm_new_widgets(codec); | ||
298 | return 0; | 298 | return 0; |
299 | } | 299 | } |
300 | 300 | ||
@@ -485,17 +485,9 @@ static int ak4535_init(struct snd_soc_device *socdev) | |||
485 | snd_soc_add_controls(codec, ak4535_snd_controls, | 485 | snd_soc_add_controls(codec, ak4535_snd_controls, |
486 | ARRAY_SIZE(ak4535_snd_controls)); | 486 | ARRAY_SIZE(ak4535_snd_controls)); |
487 | ak4535_add_widgets(codec); | 487 | 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 | 488 | ||
494 | return ret; | 489 | return ret; |
495 | 490 | ||
496 | card_err: | ||
497 | snd_soc_free_pcms(socdev); | ||
498 | snd_soc_dapm_free(socdev); | ||
499 | pcm_err: | 491 | pcm_err: |
500 | kfree(codec->reg_cache); | 492 | kfree(codec->reg_cache); |
501 | 493 | ||