1 files changed, 5 insertions, 13 deletions

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 4393394b7bc1..2df253c18568 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -72,7 +72,6 @@ static const u16 wm8960_reg[WM8960_CACHEREGNUM] = {
 
 struct wm8960_priv {
         enum snd_soc_control_type control_type;
-        void *control_data;
         int (*set_bias_level)(struct snd_soc_codec *,
                               enum snd_soc_bias_level level);
         struct snd_soc_dapm_widget *lout1;
@@ -575,6 +574,8 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
 
         case SND_SOC_BIAS_STANDBY:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
+                        snd_soc_cache_sync(codec);
+
                         /* Enable anti-pop features */
                         snd_soc_write(codec, WM8960_APOP1,
                                       WM8960_POBCTRL | WM8960_SOFT_ST |
@@ -677,6 +678,9 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
                                             WM8960_VREF | WM8960_VMID_MASK, 0);
                         break;
 
+                case SND_SOC_BIAS_OFF:
+                        snd_soc_cache_sync(codec);
+                        break;
                 default:
                         break;
                 }
@@ -902,16 +906,6 @@ static int wm8960_suspend(struct snd_soc_codec *codec, pm_message_t state)
 static int wm8960_resume(struct snd_soc_codec *codec)
 {
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
-        int i;
-        u8 data[2];
-        u16 *cache = codec->reg_cache;
-
-        /* Sync reg_cache with the hardware */
-        for (i = 0; i < ARRAY_SIZE(wm8960_reg); i++) {
-                data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
-                data[1] = cache[i] & 0x00ff;
-                codec->hw_write(codec->control_data, data, 2);
-        }
 
         wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         return 0;
@@ -925,7 +919,6 @@ static int wm8960_probe(struct snd_soc_codec *codec)
         u16 reg;
 
         wm8960->set_bias_level = wm8960_set_bias_level_out3;
-        codec->control_data = wm8960->control_data;
 
         if (!pdata) {
                 dev_warn(codec->dev, "No platform data supplied\n");
@@ -1015,7 +1008,6 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
 
         i2c_set_clientdata(i2c, wm8960);
         wm8960->control_type = SND_SOC_I2C;
-        wm8960->control_data = i2c;
 
         ret = snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8960, &wm8960_dai, 1);