Merge branch 'topic/ca0106' into for-linus

[cascardo/linux.git] / sound / pci / echoaudio / gina20_dsp.c

diff --git a/sound/pci/echoaudio/gina20_dsp.c b/sound/pci/echoaudio/gina20_dsp.c
index 2757c89..3f1e747 100644 (file)
--- a/sound/pci/echoaudio/gina20_dsp.c
+++ b/sound/pci/echoaudio/gina20_dsp.c
@@ -38,7 +38,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
        int err;
 
        DE_INIT(("init_hw() - Gina20\n"));
-       snd_assert((subdevice_id & 0xfff0) == GINA20, return -ENODEV);
+       if (snd_BUG_ON((subdevice_id & 0xfff0) != GINA20))
+               return -ENODEV;
 
        if ((err = init_dsp_comm_page(chip))) {
                DE_INIT(("init_hw - could not initialize DSP comm page\n"));
@@ -177,7 +178,8 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)
 /* Set input bus gain (one unit is 0.5dB !) */
 static int set_input_gain(struct echoaudio *chip, u16 input, int gain)
 {
-       snd_assert(input < num_busses_in(chip), return -EINVAL);
+       if (snd_BUG_ON(input >= num_busses_in(chip)))
+               return -EINVAL;
 
        if (wait_handshake(chip))
                return -EIO;
@@ -206,10 +208,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)
        DE_ACT(("set_professional_spdif %d\n", prof));
        if (prof)
                chip->comm_page->flags |=
-                       __constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
+                       cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
        else
                chip->comm_page->flags &=
-                       ~__constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
+                       ~cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
        chip->professional_spdif = prof;
        return update_flags(chip);
 }