[ALSA] pcm - Fix wrong asserts
authorTakashi Iwai <tiwai@suse.de>
Wed, 7 Dec 2005 14:28:07 +0000 (15:28 +0100)
committerJaroslav Kysela <perex@suse.cz>
Tue, 3 Jan 2006 11:30:41 +0000 (12:30 +0100)
Modules: PCM Midlevel

Fixed wrong or supreflous snd_assert()'s.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/pcm_lib.c

index c58ec67d1cbfbebdde187bb5c5cfe1d4d1b4b038..eeba2f060955d3b3de52aaa39a3ae48d8d64f494 100644 (file)
@@ -56,9 +56,8 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram
                                runtime->silence_filled = 0;
                        runtime->silence_start = runtime->control->appl_ptr;
                }
                                runtime->silence_filled = 0;
                        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;
                if (noise_dist >= (snd_pcm_sframes_t) runtime->silence_threshold)
                        return;
                noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;
                if (noise_dist >= (snd_pcm_sframes_t) runtime->silence_threshold)
                        return;
@@ -2006,8 +2005,8 @@ void snd_pcm_tick_prepare(struct snd_pcm_substream *substream)
                           runtime->silence_filled < runtime->buffer_size) {
                        snd_pcm_sframes_t noise_dist;
                        noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;
                           runtime->silence_filled < runtime->buffer_size) {
                        snd_pcm_sframes_t noise_dist;
                        noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime->silence_filled;
-                       snd_assert(noise_dist <= (snd_pcm_sframes_t)runtime->silence_threshold, );
-                       frames = noise_dist - runtime->silence_threshold;
+                       if (noise_dist > (snd_pcm_sframes_t)runtime->silence_threshold)
+                               frames = noise_dist - runtime->silence_threshold;
                }
                avail = snd_pcm_playback_avail(runtime);
        } else {
                }
                avail = snd_pcm_playback_avail(runtime);
        } else {