Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[cascardo/linux.git] / sound / soc / codecs / wm8960.c

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index eba3ac0..7233cc6 100644 (file)
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -15,6 +15,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>
@@ -738,10 +739,6 @@ static int wm8960_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
        u16 reg;
 
        switch (div_id) {
-       case WM8960_SYSCLKSEL:
-               reg = snd_soc_read(codec, WM8960_CLOCK1) & 0x1fe;
-               snd_soc_write(codec, WM8960_CLOCK1, reg | div);
-               break;
        case WM8960_SYSCLKDIV:
                reg = snd_soc_read(codec, WM8960_CLOCK1) & 0x1f9;
                snd_soc_write(codec, WM8960_CLOCK1, reg | div);
@@ -827,7 +824,7 @@ static int wm8960_resume(struct platform_device *pdev)
        }
 
        codec->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-       codec->set_bias_level(codec, codec->suspend_bias_level);
+
        return 0;
 }