summaryrefslogtreecommitdiff
path: root/sound/sparc/cs4231.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/sparc/cs4231.c')
-rw-r--r--sound/sparc/cs4231.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index dbb1b625..54aaad2 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -429,8 +429,7 @@ static void snd_cs4231_advance_dma(struct cs4231_dma_control *dma_cont,
unsigned int period_size = snd_pcm_lib_period_bytes(substream);
unsigned int offset = period_size * (*periods_sent);
- if (WARN_ON(period_size >= (1 << 24)))
- return;
+ BUG_ON(period_size >= (1 << 24));
if (dma_cont->request(dma_cont,
runtime->dma_addr + offset, period_size))
@@ -907,24 +906,18 @@ static int snd_cs4231_playback_prepare(struct snd_pcm_substream *substream)
struct snd_cs4231 *chip = snd_pcm_substream_chip(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
unsigned long flags;
- int ret = 0;
spin_lock_irqsave(&chip->lock, flags);
chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE |
CS4231_PLAYBACK_PIO);
- if (WARN_ON(runtime->period_size > 0xffff + 1)) {
- ret = -EINVAL;
- goto out;
- }
+ BUG_ON(runtime->period_size > 0xffff + 1);
chip->p_periods_sent = 0;
-
-out:
spin_unlock_irqrestore(&chip->lock, flags);
- return ret;
+ return 0;
}
static int snd_cs4231_capture_hw_params(struct snd_pcm_substream *substream,