1 files changed, 5 insertions, 20 deletions

diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 2d702db4131d..831f4730bfd5 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -18,6 +18,7 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -920,7 +921,6 @@ static int wm8990_add_widgets(struct snd_soc_codec *codec)
         /* set up the WM8990 audio map */
         snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-        snd_soc_dapm_new_widgets(codec);
         return 0;
 }
 
@@ -972,8 +972,8 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target,
         pll_div->k = K;
 }
 
-static int wm8990_set_dai_pll(struct snd_soc_dai *codec_dai,
-                int pll_id, unsigned int freq_in, unsigned int freq_out)
+static int wm8990_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
+                int source, unsigned int freq_in, unsigned int freq_out)
 {
         u16 reg;
         struct snd_soc_codec *codec = codec_dai->codec;
@@ -991,7 +991,7 @@ static int wm8990_set_dai_pll(struct snd_soc_dai *codec_dai,
                 reg = snd_soc_read(codec, WM8990_CLOCKING_2);
                 snd_soc_write(codec, WM8990_CLOCKING_2, reg | WM8990_SYSCLK_SRC);
 
-                /* set up N , fractional mode and pre-divisor if neccessary */
+                /* set up N , fractional mode and pre-divisor if necessary */
                 snd_soc_write(codec, WM8990_PLL1, pll_div.n | WM8990_SDM |
                         (pll_div.div2?WM8990_PRESCALE:0));
                 snd_soc_write(codec, WM8990_PLL2, (u8)(pll_div.k>>8));
@@ -1320,10 +1320,6 @@ static int wm8990_suspend(struct platform_device *pdev, pm_message_t state)
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
         struct snd_soc_codec *codec = socdev->card->codec;
 
-        /* we only need to suspend if we are a valid card */
-        if (!codec->card)
-                return 0;
-
         wm8990_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
@@ -1336,10 +1332,6 @@ static int wm8990_resume(struct platform_device *pdev)
         u8 data[2];
         u16 *cache = codec->reg_cache;
 
-        /* we only need to resume if we are a valid card */
-        if (!codec->card)
-                return 0;
-
         /* Sync reg_cache with the hardware */
         for (i = 0; i < ARRAY_SIZE(wm8990_reg); i++) {
                 if (i + 1 == WM8990_RESET)
@@ -1409,16 +1401,9 @@ static int wm8990_init(struct snd_soc_device *socdev)
         snd_soc_add_controls(codec, wm8990_snd_controls,
                                 ARRAY_SIZE(wm8990_snd_controls));
         wm8990_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8990: failed to register card\n");
-                goto card_err;
-        }
+
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         kfree(codec->reg_cache);
         return ret;