Merge ../linux-2.6

3 files changed, 55 insertions, 62 deletions

diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index ba4b5c199f21..9384702c7ebd 100644
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -231,7 +231,7 @@ static int au1xpsc_i2s_stop(struct au1xpsc_audio_data *pscdata, int stype)
 
         /* if both TX and RX are idle, disable PSC */
         stat = au_readl(I2S_STAT(pscdata));
-        if (!(stat & (PSC_I2SSTAT_RB | PSC_I2SSTAT_RB))) {
+        if (!(stat & (PSC_I2SSTAT_TB | PSC_I2SSTAT_RB))) {
                 au_writel(0, I2S_CFG(pscdata));
                 au_sync();
                 au_writel(PSC_CTRL_SUSPEND, PSC_CTRL(pscdata));
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 9fc8edd82225..1fb7f9a7aecd 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -427,20 +427,20 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"HPOUTR", NULL, "Headphone PGA"},
         {"Headphone PGA", NULL, "Right HP Mixer"},
 
-        /* mono hp mixer */
-        {"Mono HP Mixer", NULL, "Left HP Mixer"},
-        {"Mono HP Mixer", NULL, "Right HP Mixer"},
+        /* mono mixer */
+        {"Mono Mixer", NULL, "Left HP Mixer"},
+        {"Mono Mixer", NULL, "Right HP Mixer"},
 
         /* Out3 Mux */
         {"Out3 Mux", "Left", "Left HP Mixer"},
         {"Out3 Mux", "Mono", "Phone Mixer"},
-        {"Out3 Mux", "Left + Right", "Mono HP Mixer"},
+        {"Out3 Mux", "Left + Right", "Mono Mixer"},
         {"Out 3 PGA", NULL, "Out3 Mux"},
         {"OUT3", NULL, "Out 3 PGA"},
 
         /* speaker Mux */
         {"Speaker Mux", "Speaker Mix", "Speaker Mixer"},
-        {"Speaker Mux", "Headphone Mix", "Mono HP Mixer"},
+        {"Speaker Mux", "Headphone Mix", "Mono Mixer"},
         {"Speaker PGA", NULL, "Speaker Mux"},
         {"LOUT2", NULL, "Speaker PGA"},
         {"ROUT2", NULL, "Speaker PGA"},
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 2c87061c2a6b..820347c9ae4b 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -523,24 +523,6 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
                                 continue;
                         }
 
-                        /* programmable gain/attenuation */
-                        if (w->id == snd_soc_dapm_pga) {
-                                int on;
-                                in = is_connected_input_ep(w);
-                                dapm_clear_walk(w->codec);
-                                out = is_connected_output_ep(w);
-                                dapm_clear_walk(w->codec);
-                                w->power = on = (out != 0 && in != 0) ? 1 : 0;
-
-                                if (!on)
-                                        dapm_set_pga(w, on); /* lower volume to reduce pops */
-                                dapm_update_bits(w);
-                                if (on)
-                                        dapm_set_pga(w, on); /* restore volume from zero */
-
-                                continue;
-                        }
-
                         /* pre and post event widgets */
                         if (w->id == snd_soc_dapm_pre) {
                                 if (!w->event)
@@ -586,45 +568,56 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
                         power_change = (w->power == power) ? 0: 1;
                         w->power = power;
 
+                        if (!power_change)
+                                continue;
+
                         /* call any power change event handlers */
-                        if (power_change) {
-                                if (w->event) {
-                                        pr_debug("power %s event for %s flags %x\n",
-                                                 w->power ? "on" : "off", w->name, w->event_flags);
-                                        if (power) {
-                                                /* power up event */
-                                                if (w->event_flags & SND_SOC_DAPM_PRE_PMU) {
-                                                        ret = w->event(w,
-                                                                NULL, SND_SOC_DAPM_PRE_PMU);
-                                                        if (ret < 0)
-                                                                return ret;
-                                                }
-                                                dapm_update_bits(w);
-                                                if (w->event_flags & SND_SOC_DAPM_POST_PMU){
-                                                        ret = w->event(w,
-                                                                NULL, SND_SOC_DAPM_POST_PMU);
-                                                        if (ret < 0)
-                                                                return ret;
-                                                }
-                                        } else {
-                                                /* power down event */
-                                                if (w->event_flags & SND_SOC_DAPM_PRE_PMD) {
-                                                        ret = w->event(w,
-                                                                NULL, SND_SOC_DAPM_PRE_PMD);
-                                                        if (ret < 0)
-                                                                return ret;
-                                                }
-                                                dapm_update_bits(w);
-                                                if (w->event_flags & SND_SOC_DAPM_POST_PMD) {
-                                                        ret = w->event(w,
-                                                                NULL, SND_SOC_DAPM_POST_PMD);
-                                                        if (ret < 0)
-                                                                return ret;
-                                                }
-                                        }
-                                } else
-                                        /* no event handler */
-                                        dapm_update_bits(w);
+                        if (w->event)
+                                pr_debug("power %s event for %s flags %x\n",
+                                         w->power ? "on" : "off",
+                                         w->name, w->event_flags);
+
+                        /* power up pre event */
+                        if (power && w->event &&
+                            (w->event_flags & SND_SOC_DAPM_PRE_PMU)) {
+                                ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMU);
+                                if (ret < 0)
+                                        return ret;
+                        }
+
+                        /* power down pre event */
+                        if (!power && w->event &&
+                            (w->event_flags & SND_SOC_DAPM_PRE_PMD)) {
+                                ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMD);
+                                if (ret < 0)
+                                        return ret;
+                        }
+
+                        /* Lower PGA volume to reduce pops */
+                        if (w->id == snd_soc_dapm_pga && !power)
+                                dapm_set_pga(w, power);
+
+                        dapm_update_bits(w);
+
+                        /* Raise PGA volume to reduce pops */
+                        if (w->id == snd_soc_dapm_pga && power)
+                                dapm_set_pga(w, power);
+
+                        /* power up post event */
+                        if (power && w->event &&
+                            (w->event_flags & SND_SOC_DAPM_POST_PMU)) {
+                                ret = w->event(w,
+                                               NULL, SND_SOC_DAPM_POST_PMU);
+                                if (ret < 0)
+                                        return ret;
+                        }
+
+                        /* power down post event */
+                        if (!power && w->event &&
+                            (w->event_flags & SND_SOC_DAPM_POST_PMD)) {
+                                ret = w->event(w, NULL, SND_SOC_DAPM_POST_PMD);
+                                if (ret < 0)
+                                        return ret;
                         }
                 }
         }