Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 23687
b: refs/heads/master
c: 817dd6e
h: refs/heads/master
i:
  23685: 351d21d
  23683: 431708a
  23679: 0941987
v: v3
  • Loading branch information
Eric Sesterhenn authored and Adrian Bunk committed Mar 24, 2006
1 parent f88c714 commit 9ccb83e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7ac1e877d48061aa6ebca936189c32b44ccf8d9c
refs/heads/master: 817dd6eed4bf40fa14d1e96ac4905efebd5e03f2
6 changes: 2 additions & 4 deletions trunk/sound/sparc/cs4231.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 9ccb83e

Please sign in to comment.