ASoC: Fix handling of DAPM suspend work

Since we can query the playback stream power state directly we do not
need to infer if it is powered up from the timer being scheduled.  Doing
this avoids problems that previously existed with streams being
incorrectly determined to be powered up caused when the timer is
scheduled when streams are closed after being partially set up.

Reported-by: Nobin Mathew <nobin.mathew@gmail.com>
Reported-by: Jukka Hynninen <ext-jukka.hynninen@vaisala.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 23 insertions, 32 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 4707042b3dad..411fd3bcf44f 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -429,51 +429,42 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
                 }
         }
 
-        /* we only want to start a DAPM playback stream if we are not waiting
-         * on an existing one stopping */
-        if (codec_dai->pop_wait) {
-                /* we are waiting for the delayed work to start */
-                if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-                                snd_soc_dapm_stream_event(socdev->codec,
-                                        codec_dai->capture.stream_name,
-                                        SND_SOC_DAPM_STREAM_START);
-                else {
-                        codec_dai->pop_wait = 0;
-                        cancel_delayed_work(&socdev->delayed_work);
-                        snd_soc_dai_digital_mute(codec_dai, 0);
-                }
-        } else {
-                /* no delayed work - do we need to power up codec */
-                if (codec->bias_level != SND_SOC_BIAS_ON) {
+        /* cancel any delayed stream shutdown that is pending */
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
+            codec_dai->pop_wait) {
+                codec_dai->pop_wait = 0;
+                cancel_delayed_work(&socdev->delayed_work);
+        }
 
-                        snd_soc_dapm_set_bias_level(socdev,
-                                                    SND_SOC_BIAS_PREPARE);
+        /* do we need to power up codec */
+        if (codec->bias_level != SND_SOC_BIAS_ON) {
+                snd_soc_dapm_set_bias_level(socdev,
+                                            SND_SOC_BIAS_PREPARE);
 
-                        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                                snd_soc_dapm_stream_event(codec,
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                        snd_soc_dapm_stream_event(codec,
                                         codec_dai->playback.stream_name,
                                         SND_SOC_DAPM_STREAM_START);
-                        else
-                                snd_soc_dapm_stream_event(codec,
+                else
+                        snd_soc_dapm_stream_event(codec,
                                         codec_dai->capture.stream_name,
                                         SND_SOC_DAPM_STREAM_START);
 
-                        snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_ON);
-                        snd_soc_dai_digital_mute(codec_dai, 0);
+                snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_ON);
+                snd_soc_dai_digital_mute(codec_dai, 0);
 
-                } else {
-                        /* codec already powered - power on widgets */
-                        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                                snd_soc_dapm_stream_event(codec,
+        } else {
+                /* codec already powered - power on widgets */
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                        snd_soc_dapm_stream_event(codec,
                                         codec_dai->playback.stream_name,
                                         SND_SOC_DAPM_STREAM_START);
-                        else
-                                snd_soc_dapm_stream_event(codec,
+                else
+                        snd_soc_dapm_stream_event(codec,
                                         codec_dai->capture.stream_name,
                                         SND_SOC_DAPM_STREAM_START);
 
-                        snd_soc_dai_digital_mute(codec_dai, 0);
-                }
+                snd_soc_dai_digital_mute(codec_dai, 0);
         }
 
 out: