ALSA: Kill snd_assert() in sound/pci/*

[linux-2.6-omap-h63xx.git] / sound / pci / echoaudio / indigodj_dsp.c

diff --git a/sound/pci/echoaudio/indigodj_dsp.c b/sound/pci/echoaudio/indigodj_dsp.c
index 500e150b49fcaa340f6028300d1de19d62d57798..90730a5ecb422b880c8e36aff0d21adf2d8198aa 100644 (file)
--- a/sound/pci/echoaudio/indigodj_dsp.c
+++ b/sound/pci/echoaudio/indigodj_dsp.c
@@ -39,7 +39,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
        int err;
 
        DE_INIT(("init_hw() - Indigo DJ\n"));
-       snd_assert((subdevice_id & 0xfff0) == INDIGO_DJ, return -ENODEV);
+       if (snd_BUG_ON((subdevice_id & 0xfff0) != INDIGO_DJ))
+               return -ENODEV;
 
        if ((err = init_dsp_comm_page(chip))) {
                DE_INIT(("init_hw - could not initialize DSP comm page\n"));
@@ -143,8 +144,9 @@ static int set_vmixer_gain(struct echoaudio *chip, u16 output, u16 pipe,
 {
        int index;
 
-       snd_assert(pipe < num_pipes_out(chip) &&
-                  output < num_busses_out(chip), return -EINVAL);
+       if (snd_BUG_ON(pipe >= num_pipes_out(chip) ||
+                      output >= num_busses_out(chip)))
+               return -EINVAL;
 
        if (wait_handshake(chip))
                return -EIO;