diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 12:49:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 12:49:27 +0200 |
| commit | 1389ac4b976abdc0555280dfc1aa2c3abcc19641 (patch) | |
| tree | 1ec51aa0b1e33201f6f4f3bebc657f9ec65f8539 /sound/drivers/vx/vx_uer.c | |
| parent | 69e13ad56f9e2cd81c4f8bfd6267211c10c14c08 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/signal
Conflicts:
arch/x86/kernel/signal_64.c
Diffstat (limited to 'sound/drivers/vx/vx_uer.c')
| -rw-r--r-- | sound/drivers/vx/vx_uer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/drivers/vx/vx_uer.c b/sound/drivers/vx/vx_uer.c index fb8932af888..0e1ba9b4790 100644 --- a/sound/drivers/vx/vx_uer.c +++ b/sound/drivers/vx/vx_uer.c @@ -163,13 +163,15 @@ static int vx_calc_clock_from_freq(struct vx_core *chip, int freq) { int hexfreq; - snd_assert(freq > 0, return 0); + if (snd_BUG_ON(freq <= 0)) + return 0; hexfreq = (28224000 * 10) / freq; hexfreq = (hexfreq + 5) / 10; /* max freq = 55125 Hz */ - snd_assert(hexfreq > 0x00000200, return 0); + if (snd_BUG_ON(hexfreq <= 0x00000200)) + return 0; if (hexfreq <= 0x03ff) return hexfreq - 0x00000201; |