diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-08-08 11:12:14 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-13 05:46:38 -0400 |
commit | da3cec35dd3c31d8706db4bf379372ce70d92118 (patch) | |
tree | 9379edebb1c7abc7a7a92ce3be30a35b77d9aa1d /sound/pci/emu10k1/emufx.c | |
parent | 622207dc31895b4e82c39100db8635d885c795e2 (diff) |
ALSA: Kill snd_assert() in sound/pci/*
Kill snd_assert() in sound/pci/*, 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/pci/emu10k1/emufx.c')
-rw-r--r-- | sound/pci/emu10k1/emufx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index 71dc4c8865b8..7dba08f0ab8e 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c | |||
@@ -487,7 +487,8 @@ static void snd_emu10k1_write_op(struct snd_emu10k1_fx8010_code *icode, | |||
487 | u32 op, u32 r, u32 a, u32 x, u32 y) | 487 | u32 op, u32 r, u32 a, u32 x, u32 y) |
488 | { | 488 | { |
489 | u_int32_t *code; | 489 | u_int32_t *code; |
490 | snd_assert(*ptr < 512, return); | 490 | if (snd_BUG_ON(*ptr >= 512)) |
491 | return; | ||
491 | code = (u_int32_t __force *)icode->code + (*ptr) * 2; | 492 | code = (u_int32_t __force *)icode->code + (*ptr) * 2; |
492 | set_bit(*ptr, icode->code_valid); | 493 | set_bit(*ptr, icode->code_valid); |
493 | code[0] = ((x & 0x3ff) << 10) | (y & 0x3ff); | 494 | code[0] = ((x & 0x3ff) << 10) | (y & 0x3ff); |
@@ -503,7 +504,8 @@ static void snd_emu10k1_audigy_write_op(struct snd_emu10k1_fx8010_code *icode, | |||
503 | u32 op, u32 r, u32 a, u32 x, u32 y) | 504 | u32 op, u32 r, u32 a, u32 x, u32 y) |
504 | { | 505 | { |
505 | u_int32_t *code; | 506 | u_int32_t *code; |
506 | snd_assert(*ptr < 1024, return); | 507 | if (snd_BUG_ON(*ptr >= 1024)) |
508 | return; | ||
507 | code = (u_int32_t __force *)icode->code + (*ptr) * 2; | 509 | code = (u_int32_t __force *)icode->code + (*ptr) * 2; |
508 | set_bit(*ptr, icode->code_valid); | 510 | set_bit(*ptr, icode->code_valid); |
509 | code[0] = ((x & 0x7ff) << 12) | (y & 0x7ff); | 511 | code[0] = ((x & 0x7ff) << 12) | (y & 0x7ff); |