diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 23:56:43 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 23:56:43 +0900 |
| commit | 326b06a8a9b09d6d9a276fd550b6b6bb138e9a47 (patch) | |
| tree | b9bdcb0bd635b91258cec09c981af2c5dcc0f683 /sound/soc | |
| parent | 92b2e81d6f95bcee386abac4c4389f5b950f7bb9 (diff) | |
| parent | 9bffb1fb7c22c96d51d4ba06e2e023dd568a5872 (diff) | |
| download | linux-3.10-326b06a8a9b09d6d9a276fd550b6b6bb138e9a47.tar.gz linux-3.10-326b06a8a9b09d6d9a276fd550b6b6bb138e9a47.tar.bz2 linux-3.10-326b06a8a9b09d6d9a276fd550b6b6bb138e9a47.zip | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-compress.c | 2 | ||||
| -rw-r--r-- | sound/soc/soc-pcm.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 967d0e173e1..5fbfb06e808 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -113,7 +113,7 @@ static int soc_compr_free(struct snd_compr_stream *cstream) SNDRV_PCM_STREAM_PLAYBACK, SND_SOC_DAPM_STREAM_STOP); } else - codec_dai->pop_wait = 1; + rtd->pop_wait = 1; schedule_delayed_work(&rtd->delayed_work, msecs_to_jiffies(rtd->pmdown_time)); } else { diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 5c3ca2a3466..d7711fce119 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -334,11 +334,11 @@ static void close_delayed_work(struct work_struct *work) dev_dbg(rtd->dev, "ASoC: pop wq checking: %s status: %s waiting: %s\n", codec_dai->driver->playback.stream_name, codec_dai->playback_active ? "active" : "inactive", - codec_dai->pop_wait ? "yes" : "no"); + rtd->pop_wait ? "yes" : "no"); /* are we waiting on this codec DAI stream */ - if (codec_dai->pop_wait == 1) { - codec_dai->pop_wait = 0; + if (rtd->pop_wait == 1) { + rtd->pop_wait = 0; snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, SND_SOC_DAPM_STREAM_STOP); } @@ -408,7 +408,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) SND_SOC_DAPM_STREAM_STOP); } else { /* start delayed pop wq here for playback streams */ - codec_dai->pop_wait = 1; + rtd->pop_wait = 1; schedule_delayed_work(&rtd->delayed_work, msecs_to_jiffies(rtd->pmdown_time)); } @@ -480,8 +480,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) /* cancel any delayed stream shutdown that is pending */ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && - codec_dai->pop_wait) { - codec_dai->pop_wait = 0; + rtd->pop_wait) { + rtd->pop_wait = 0; cancel_delayed_work(&rtd->delayed_work); } |