summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorMarcin Ślusarz <marcin.slusarz@gmail.com>2007-12-14 12:50:16 +0100
committerJaroslav Kysela <perex@perex.cz>2008-01-31 17:29:35 +0100
commitb05e578740b5e58b729857321048c4babb24bf2b (patch)
tree5ba26b45d826e51658b16db2f5920d09f657c0a0 /sound/core
parentcd0b4ac839529e0f458e83946f49f3f30b7b5be8 (diff)
downloadop-kernel-dev-b05e578740b5e58b729857321048c4babb24bf2b.zip
op-kernel-dev-b05e578740b5e58b729857321048c4babb24bf2b.tar.gz
[ALSA] pcm_native: fix sparse warning about shadowing 'state' symbol
pcm_native: fix sparse warning about shadowing 'state' symbol Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/pcm_native.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 51294dd..7fb7c92 100644
--- a/sound/core/pcm_native.c
+++ b/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;
OpenPOWER on IntegriCloud