aboutsummaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorMarcin Ślusarz <marcin.slusarz@gmail.com>2007-12-14 12:52:53 +0100
committerJaroslav Kysela <perex@perex.cz>2008-01-31 17:29:35 +0100
commitbe3e0115e3732d77d357724a394ee465e5d0b872 (patch)
tree3ce55d3e862f06d2efa1b64b03df144fc7e9ce4d /sound/core
parent757d5a7561842dd89c79d079a3c0935cd49afb9b (diff)
downloadlinux-be3e0115e3732d77d357724a394ee465e5d0b872.tar.gz
[ALSA] pcm_lib: fix sparse warning about shadowing 'n' symbol
pcm_lib: fix sparse warning about shadowing 'n' 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_lib.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index db3d7e934ec..2d3e70b2fe3 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -1497,14 +1497,18 @@ void snd_pcm_tick_prepare(struct snd_pcm_substream *substream)
avail = snd_pcm_capture_avail(runtime);
}
if (avail < runtime->control->avail_min) {
- snd_pcm_sframes_t n = runtime->control->avail_min - avail;
- if (n > 0 && frames > (snd_pcm_uframes_t)n)
- frames = n;
+ snd_pcm_sframes_t to_avail_min =
+ runtime->control->avail_min - avail;
+ if (to_avail_min > 0 &&
+ frames > (snd_pcm_uframes_t)to_avail_min)
+ frames = to_avail_min;
}
if (avail < runtime->buffer_size) {
- snd_pcm_sframes_t n = runtime->buffer_size - avail;
- if (n > 0 && frames > (snd_pcm_uframes_t)n)
- frames = n;
+ snd_pcm_sframes_t to_buffer_size =
+ runtime->buffer_size - avail;
+ if (to_buffer_size > 0 &&
+ frames > (snd_pcm_uframes_t)to_buffer_size)
+ frames = to_buffer_size;
}
if (frames == ULONG_MAX) {
snd_pcm_tick_set(substream, 0);