---

yaml --- r: 81551 b: refs/heads/master c: b05e578 h: refs/heads/master i: 81549: 5cf999c 81547: 9405570 81543: e87866a 81535: 8cbf7ee v: v3
git-mirror · Jan 31, 2008 · 548ad45 · 548ad45
1 parent 2f2f37c
commit 548ad45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd0b4ac839529e0f458e83946f49f3f30b7b5be8
+refs/heads/master: b05e578740b5e58b729857321048c4babb24bf2b
diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c
@@ -1395,10 +1395,10 @@ static int snd_pcm_do_drain_init(struct snd_pcm_substream *substream, int state)
 	} else {
 		/* stop running stream */
 		if (runtime->status->state == SNDRV_PCM_STATE_RUNNING) {
-			int state = snd_pcm_capture_avail(runtime) > 0 ?
+			int new_state = snd_pcm_capture_avail(runtime) > 0 ?
 				SNDRV_PCM_STATE_DRAINING : SNDRV_PCM_STATE_SETUP;
-			snd_pcm_do_stop(substream, state);
-			snd_pcm_post_stop(substream, state);
+			snd_pcm_do_stop(substream, new_state);
+			snd_pcm_post_stop(substream, new_state);
 		}
 	}
 	return 0;