Merge branch 'for-3.1' into for-3.2

diff --combined sound/soc/codecs/ssm2602.c
index cceb0022f02c3c660c873a45e979e028ef91ddc8,9801cd7cfcb55ca108c3689d504e7b78a7944a04..32d6c51418604e61050094c1e3e6962ecec18383
--- 1/sound/soc/codecs/ssm2602.c
--- 2/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@@ -294,6 -294,7 +294,6 @@@ static int ssm2602_startup(struct snd_p
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_codec *codec = rtd->codec;
        struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);
 -      struct i2c_client *i2c = codec->control_data;
        struct snd_pcm_runtime *master_runtime;
  
        /* The DAI has shared clocks so if we already have a playback or
@@@ -302,7 -303,7 +302,7 @@@
         */
        if (ssm2602->master_substream) {
                master_runtime = ssm2602->master_substream->runtime;
 -              dev_dbg(&i2c->dev, "Constraining to %d bits at %dHz\n",
 +              dev_dbg(codec->dev, "Constraining to %d bits at %dHz\n",
                        master_runtime->sample_bits,
                        master_runtime->rate);
  
@@@ -430,7 -431,8 +430,8 @@@ static int ssm2602_set_dai_fmt(struct s
  static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
                                 enum snd_soc_bias_level level)
  {
-       u16 reg = snd_soc_read(codec, SSM2602_PWR) & 0xff7f;
+       u16 reg = snd_soc_read(codec, SSM2602_PWR);
+       reg &= ~(PWR_POWER_OFF | PWR_OSC_PDN);
  
        switch (level) {
        case SND_SOC_BIAS_ON: