From 548ad45bee7f2cdeb65d5f14aa6b5380c972bfcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@gmail.com>
Date: Fri, 14 Dec 2007 12:50:16 +0100
Subject: [PATCH] --- yaml --- r: 81551 b: refs/heads/master c:
 b05e578740b5e58b729857321048c4babb24bf2b h: refs/heads/master i:   81549:
 5cf999c69175234fcbbe65c4e33dacba459018e9   81547:
 9405570fb6eb6c9ca8289e576ebd3f66d21adc82   81543:
 e87866ac2ae9858d4e84f5c24351147f2802faec   81535:
 8cbf7eeee8794bf81fefe43dc63ced6ad00b0a78 v: v3

---
 [refs]                        | 2 +-
 trunk/sound/core/pcm_native.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d3715a234f27..9ca92ee1dbd9 100644
--- 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
index 51294dd3a7a3..7fb7c921b27d 100644
--- 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;