diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-19 23:27:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-19 23:27:54 -0700 |
| commit | 8935f4d83fa981f64817a835bfa18739fff013a7 (patch) | |
| tree | da22c98f13d4db7040297ce5c0fc168e88163bad | |
| parent | f641230ee8c93c4ceabc2861217cc7a7f265a7ee (diff) | |
| parent | 23c544c4c940b460462b0c8a919bfd75658a7f1c (diff) | |
Merge "ASoC: msm: qdsp6v2: fix crash during flac superset clip playback"
| -rw-r--r-- | sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c b/sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c index 70ed8dd3e038..841bb5bce13f 100644 --- a/sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c +++ b/sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c @@ -1762,7 +1762,12 @@ static int msm_compr_trigger(struct snd_compr_stream *cstream, int cmd) prtd->app_pointer = 0; prtd->first_buffer = 1; prtd->last_buffer = 0; - prtd->gapless_state.gapless_transition = 1; + /* + * Set gapless transition flag only if EOS hasn't been + * acknowledged already. + */ + if (atomic_read(&prtd->eos)) + prtd->gapless_state.gapless_transition = 1; prtd->marker_timestamp = 0; /* |