Skip to contentSkip to conversation

ASoC: Intel: sst: fix a loop timeout in sst_hsw_stream_reset()

PATCH In review Dan Carpenter 3 participants 3 messages Apr 6, 2016 – Apr 7, 2016

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: Intel: sst: fix a loop timeout in sst_hsw_stream_reset()

In the original code we ended the loop with tries set to -1 instead of zero.

---
Not tested.

sound/soc/intel/haswell/sst-haswell-ipc.c +1 -1
index ac60f13..9156522 100644
@@ -1345,7 +1345,7 @@ int sst_hsw_stream_reset(struct sst_hsw *hsw, struct sst_hsw_stream *stream)
 		return 0;
 
 	/* wait for pause to complete before we reset the stream */
-	while (stream->running && tries--)
+	while (stream->running && --tries)
 		msleep(1);
 	if (!tries) {
 		dev_err(hsw->dev, "error: reset stream %d still running\n",
maintainer
#1 lore raw

Applied "ASoC: Intel: sst: fix a loop timeout in sst_hsw_stream_reset()" to the asoc tree

The patch

ASoC: Intel: sst: fix a loop timeout in sst_hsw_stream_reset()

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From b8af8b1d80db13dd4f5e5a3698180bd9c14aee03 Mon Sep 17 00:00:00 2001

From: Dan Carpenter <[email protected]>
Date: Wed, 6 Apr 2016 14:36:06 +0300
Subject: [PATCH] ASoC: Intel: sst: fix a loop timeout in
sst_hsw_stream_reset()

In the original code we ended the loop with tries set to -1 instead of zero.

---
 sound/soc/intel/haswell/sst-haswell-ipc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/haswell/sst-haswell-ipc.c +1 -1
index ac60f1301e21..91565229d074 100644
@@ -1345,7 +1345,7 @@ int sst_hsw_stream_reset(struct sst_hsw *hsw, struct sst_hsw_stream *stream)
 		return 0;
 
 	/* wait for pause to complete before we reset the stream */
-	while (stream->running && tries--)
+	while (stream->running && --tries)
 		msleep(1);
 	if (!tries) {
 		dev_err(hsw->dev, "error: reset stream %d still running\n",
Signature · 1 line
2.8.0.rc3
Acked-by Jie Yang on v1 1/1
#2 lore raw
In reply to Dan Carpenter
Quoted 4 lines · Dan Carpenter

In the original code we ended the loop with tries set to -1 instead of zero.

Dan, thanks for finding and correcting it.

Thanks,
~Keyon

Quoted 21 lines

---
Not tested.

sound/soc/intel/haswell/sst-haswell-ipc.c +1 -1
index ac60f13..9156522 100644
@@ -1345,7 +1345,7 @@ int sst_hsw_stream_reset(struct sst_hsw *hsw, struct sst_hsw_stream *stream)
  		return 0;
 
  	/* wait for pause to complete before we reset the stream */
-	while (stream->running && tries--)
+	while (stream->running && --tries)
  		msleep(1);
  	if (!tries) {
  		dev_err(hsw->dev, "error: reset stream %d still running\n",

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel