diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-08-08 11:12:47 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-13 05:46:40 -0400 |
commit | 5e246b850df563224be26f1d409cf66fd6c968df (patch) | |
tree | 970e7faf60b86cb2c489a08ca506075c398165e5 /sound/arm | |
parent | da3cec35dd3c31d8706db4bf379372ce70d92118 (diff) |
ALSA: Kill snd_assert() in other places
Kill snd_assert() in other places, either removed or replaced with
if () with snd_BUG_ON().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/arm')
-rw-r--r-- | sound/arm/sa11xx-uda1341.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index b9c51bf8cd71..8addb9d914c1 100644 --- a/sound/arm/sa11xx-uda1341.c +++ b/sound/arm/sa11xx-uda1341.c | |||
@@ -442,7 +442,8 @@ static void audio_process_dma(struct audio_stream *s) | |||
442 | 442 | ||
443 | /* we are requested to process synchronization DMA transfer */ | 443 | /* we are requested to process synchronization DMA transfer */ |
444 | if (s->tx_spin) { | 444 | if (s->tx_spin) { |
445 | snd_assert(s->stream_id == SNDRV_PCM_STREAM_PLAYBACK, return); | 445 | if (snd_BUG_ON(s->stream_id != SNDRV_PCM_STREAM_PLAYBACK)) |
446 | return; | ||
446 | /* fill the xmit dma buffers and return */ | 447 | /* fill the xmit dma buffers and return */ |
447 | #ifdef HH_VERSION | 448 | #ifdef HH_VERSION |
448 | sa1100_dma_set_spin(s->dmach, FORCE_CLOCK_ADDR, FORCE_CLOCK_SIZE); | 449 | sa1100_dma_set_spin(s->dmach, FORCE_CLOCK_ADDR, FORCE_CLOCK_SIZE); |
@@ -472,7 +473,7 @@ static void audio_process_dma(struct audio_stream *s) | |||
472 | continue; /* special case */ | 473 | continue; /* special case */ |
473 | } else { | 474 | } else { |
474 | offset = dma_size * s->period; | 475 | offset = dma_size * s->period; |
475 | snd_assert(dma_size <= DMA_BUF_SIZE, ); | 476 | snd_BUG_ON(dma_size > DMA_BUF_SIZE); |
476 | } | 477 | } |
477 | #ifdef HH_VERSION | 478 | #ifdef HH_VERSION |
478 | ret = sa1100_dma_queue_buffer(s->dmach, s, runtime->dma_addr + offset, dma_size); | 479 | ret = sa1100_dma_queue_buffer(s->dmach, s, runtime->dma_addr + offset, dma_size); |