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

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

diff --git a/sound/pci/echoaudio/darla24_dsp.c b/sound/pci/echoaudio/darla24_dsp.c
index 79938eed7e9c20cbdaa106123877cb63526a5562..60228731841f84fc2b1bc814242f9e9d06839451 100644 (file)
--- a/sound/pci/echoaudio/darla24_dsp.c
+++ b/sound/pci/echoaudio/darla24_dsp.c
@@ -34,7 +34,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
        int err;
 
        DE_INIT(("init_hw() - Darla24\n"));
-       snd_assert((subdevice_id & 0xfff0) == DARLA24, return -ENODEV);
+       if (snd_BUG_ON((subdevice_id & 0xfff0) != DARLA24))
+               return -ENODEV;
 
        if ((err = init_dsp_comm_page(chip))) {
                DE_INIT(("init_hw - could not initialize DSP comm page\n"));
@@ -148,8 +149,9 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)
 
 static int set_input_clock(struct echoaudio *chip, u16 clock)
 {
-       snd_assert(clock == ECHO_CLOCK_INTERNAL ||
-                  clock == ECHO_CLOCK_ESYNC, return -EINVAL);
+       if (snd_BUG_ON(clock != ECHO_CLOCK_INTERNAL &&
+                      clock != ECHO_CLOCK_ESYNC))
+               return -EINVAL;
        chip->input_clock = clock;
        return set_sample_rate(chip, chip->sample_rate);
 }