Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5f382aa authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: fix indefinite wait in compress drain"

parents 9f6b70e9 26d9d2a1

sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -1619,7 +1619,7 @@ static int msm_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
			if (prtd->last_buffer) {

				pr_debug("%s: last buffer drain\n", __func__);

				rc = msm_compr_drain_buffer(prtd, &flags);

				if (rc) {

				if (rc || !atomic_read(&prtd->start)) {

					spin_unlock_irqrestore(&prtd->lock,

									flags);

					break;
@@ -1639,7 +1639,7 @@ static int msm_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
			/* wait for the zero length buffer to be returned */

			pr_debug("%s: zero length buffer drain\n", __func__);

			rc = msm_compr_drain_buffer(prtd, &flags);

			if (rc) {

			if (rc || !atomic_read(&prtd->start)) {

				spin_unlock_irqrestore(&prtd->lock, flags);

				break;

			}