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/echoaudio/indigoio_dsp.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/echoaudio/indigoio_dsp.c')
-rw-r--r-- | sound/pci/echoaudio/indigoio_dsp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/pci/echoaudio/indigoio_dsp.c b/sound/pci/echoaudio/indigoio_dsp.c index f3ad13d06be0..a7e09ec21079 100644 --- a/sound/pci/echoaudio/indigoio_dsp.c +++ b/sound/pci/echoaudio/indigoio_dsp.c | |||
@@ -39,7 +39,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
39 | int err; | 39 | int err; |
40 | 40 | ||
41 | DE_INIT(("init_hw() - Indigo IO\n")); | 41 | DE_INIT(("init_hw() - Indigo IO\n")); |
42 | snd_assert((subdevice_id & 0xfff0) == INDIGO_IO, return -ENODEV); | 42 | if (snd_BUG_ON((subdevice_id & 0xfff0) != INDIGO_IO)) |
43 | return -ENODEV; | ||
43 | 44 | ||
44 | if ((err = init_dsp_comm_page(chip))) { | 45 | if ((err = init_dsp_comm_page(chip))) { |
45 | DE_INIT(("init_hw - could not initialize DSP comm page\n")); | 46 | DE_INIT(("init_hw - could not initialize DSP comm page\n")); |
@@ -114,8 +115,9 @@ static int set_vmixer_gain(struct echoaudio *chip, u16 output, u16 pipe, | |||
114 | { | 115 | { |
115 | int index; | 116 | int index; |
116 | 117 | ||
117 | snd_assert(pipe < num_pipes_out(chip) && | 118 | if (snd_BUG_ON(pipe >= num_pipes_out(chip) || |
118 | output < num_busses_out(chip), return -EINVAL); | 119 | output >= num_busses_out(chip))) |
120 | return -EINVAL; | ||
119 | 121 | ||
120 | if (wait_handshake(chip)) | 122 | if (wait_handshake(chip)) |
121 | return -EIO; | 123 | return -EIO; |