Skip to content

Commit

Permalink
[ALSA] pcm_lib: fix sparse warning about shadowing 'n' symbol
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marcin Ślusarz authored and Jaroslav Kysela committed Jan 31, 2008
1 parent 757d5a7 commit be3e011
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions sound/core/pcm_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit be3e011

Please sign in to comment.