lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] pcm - Fix wrong asserts

Browse Source 
Modules: PCM Midlevel

Fixed wrong or supreflous snd_assert()'s.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2005-12-07 15:28:07 +01:00
committed by Jaroslav Kysela
parent 4a471b7ddf
commit 235475cb77
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sound/core/pcm_lib.c
View File

@@ -56,9 +56,8 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram
runtime->silence_filled = 0; runtime->silence_filled = 0;
runtime->silence_start = runtime->control->appl_ptr; runtime->silence_start = runtime->control->appl_ptr;
} }
if (runtime->silence_filled == runtime->buffer_size) if (runtime->silence_filled >= runtime->buffer_size)
return; return;
snd_assert(runtime->silence_filled <= runtime->buffer_size, return);
noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled; noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;
if (noise_dist >= (snd_pcm_sframes_t) runtime->silence_threshold) if (noise_dist >= (snd_pcm_sframes_t) runtime->silence_threshold)
return; return;
@@ -2006,8 +2005,8 @@ void snd_pcm_tick_prepare(struct snd_pcm_substream *substream)
runtime->silence_filled < runtime->buffer_size) { runtime->silence_filled < runtime->buffer_size) {
snd_pcm_sframes_t noise_dist; snd_pcm_sframes_t noise_dist;
noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled; noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;
snd_assert(noise_dist <= (snd_pcm_sframes_t)runtime->silence_threshold, ); if (noise_dist > (snd_pcm_sframes_t)runtime->silence_threshold)
frames = noise_dist - runtime->silence_threshold; frames = noise_dist - runtime->silence_threshold;
} }
avail = snd_pcm_playback_avail(runtime); avail = snd_pcm_playback_avail(runtime);
} else { } else {