3 files changed, 10 insertions, 5 deletions

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index b3175860bcb4..94dc707d9022 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1069,7 +1069,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
         case SND_SOC_BIAS_ON:
                 break;
         case SND_SOC_BIAS_PREPARE:
-                if (aic3x->master) {
+                if (codec->bias_level == SND_SOC_BIAS_STANDBY &&
+                    aic3x->master) {
                         /* enable pll */
                         reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
                         aic3x_write(codec, AIC3X_PLL_PROGA_REG,
@@ -1077,15 +1078,16 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
                 }
                 break;
         case SND_SOC_BIAS_STANDBY:
-                /* fall through and disable pll */
-        case SND_SOC_BIAS_OFF:
-                if (aic3x->master) {
+                if (codec->bias_level == SND_SOC_BIAS_PREPARE &&
+                    aic3x->master) {
                         /* disable pll */
                         reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
                         aic3x_write(codec, AIC3X_PLL_PROGA_REG,
                                     reg & ~PLL_ENABLE);
                 }
                 break;
+        case SND_SOC_BIAS_OFF:
+                break;
         }
         codec->bias_level = level;
 
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 0cd590970883..0c47c788ccdf 100644
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -193,6 +193,9 @@ static int snd_wl1273_set_audio_route(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec);
 
+        if (wl1273->mode == ucontrol->value.integer.value[0])
+                return 0;
+
         /* Do not allow changes while stream is running */
         if (codec->active)
                 return -EPERM;
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 7ba5690118f8..99696187b55a 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -759,7 +759,7 @@ static struct snd_soc_dai_driver omap_mcbsp_dai =
         .ops = &mcbsp_dai_ops,
 };
 
-int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol,
+static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_info *uinfo)
 {
         struct soc_mixer_control *mc =