From 9ccb83e39f5199ddab2ce6fa6a19450e8a9c868f Mon Sep 17 00:00:00 2001 From: Eric Sesterhenn Date: Fri, 24 Mar 2006 18:49:12 +0100 Subject: [PATCH] --- yaml --- r: 23687 b: refs/heads/master c: 817dd6eed4bf40fa14d1e96ac4905efebd5e03f2 h: refs/heads/master i: 23685: 351d21db352ebeeb7c9ec21fc723cefb08a58946 23683: 431708ad22bf0a2e3755158c41b5920f10a2e671 23679: 0941987a9cd00270ca02955c8d923d113d8899ed v: v3 --- [refs] | 2 +- trunk/sound/sparc/cs4231.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 346c07ef249d..67e64f37b614 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ac1e877d48061aa6ebca936189c32b44ccf8d9c +refs/heads/master: 817dd6eed4bf40fa14d1e96ac4905efebd5e03f2 diff --git a/trunk/sound/sparc/cs4231.c b/trunk/sound/sparc/cs4231.c index 53a148b01b6b..8804f26ddb3a 100644 --- a/trunk/sound/sparc/cs4231.c +++ b/trunk/sound/sparc/cs4231.c @@ -611,8 +611,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 (period_size >= (1 << 24)) - BUG(); + BUG_ON(period_size >= (1 << 24)); if (dma_cont->request(dma_cont, runtime->dma_addr + offset, period_size)) return; @@ -1079,8 +1078,7 @@ static int snd_cs4231_playback_prepare(struct snd_pcm_substream *substream) chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE | CS4231_PLAYBACK_PIO); - if (runtime->period_size > 0xffff + 1) - BUG(); + BUG_ON(runtime->period_size > 0xffff + 1); chip->p_periods_sent = 0; spin_unlock_irqrestore(&chip->lock, flags);