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/emu10k1_callback.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/emu10k1_callback.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1_callback.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c index 45088ebcce50..0e649dcdbf64 100644 --- a/sound/pci/emu10k1/emu10k1_callback.c +++ b/sound/pci/emu10k1/emu10k1_callback.c | |||
@@ -145,7 +145,8 @@ terminate_voice(struct snd_emux_voice *vp) | |||
145 | { | 145 | { |
146 | struct snd_emu10k1 *hw; | 146 | struct snd_emu10k1 *hw; |
147 | 147 | ||
148 | snd_assert(vp, return); | 148 | if (snd_BUG_ON(!vp)) |
149 | return; | ||
149 | hw = vp->hw; | 150 | hw = vp->hw; |
150 | snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, 0x807f | DCYSUSV_CHANNELENABLE_MASK); | 151 | snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, 0x807f | DCYSUSV_CHANNELENABLE_MASK); |
151 | if (vp->block) { | 152 | if (vp->block) { |
@@ -325,7 +326,8 @@ start_voice(struct snd_emux_voice *vp) | |||
325 | 326 | ||
326 | hw = vp->hw; | 327 | hw = vp->hw; |
327 | ch = vp->ch; | 328 | ch = vp->ch; |
328 | snd_assert(ch >= 0, return -EINVAL); | 329 | if (snd_BUG_ON(ch < 0)) |
330 | return -EINVAL; | ||
329 | chan = vp->chan; | 331 | chan = vp->chan; |
330 | 332 | ||
331 | emem = (struct snd_emu10k1_memblk *)vp->block; | 333 | emem = (struct snd_emu10k1_memblk *)vp->block; |