tunnels: fix netns vs proto registration ordering

[safe/jmp/linux-2.6] / sound / pci / echoaudio / echo3g_dsp.c

diff --git a/sound/pci/echoaudio/echo3g_dsp.c b/sound/pci/echoaudio/echo3g_dsp.c
index d26a1d1..57967e5 100644 (file)
--- a/sound/pci/echoaudio/echo3g_dsp.c
+++ b/sound/pci/echoaudio/echo3g_dsp.c
@@ -39,7 +39,7 @@ static int set_phantom_power(struct echoaudio *chip, char on);
 static int write_control_reg(struct echoaudio *chip, u32 ctl, u32 frq,
                             char force);
 
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 
 static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
 {
@@ -47,7 +47,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
 
        local_irq_enable();
        DE_INIT(("init_hw() - Echo3G\n"));
-       snd_assert((subdevice_id & 0xfff0) == ECHO3G, return -ENODEV);
+       if (snd_BUG_ON((subdevice_id & 0xfff0) != ECHO3G))
+               return -ENODEV;
 
        if ((err = init_dsp_comm_page(chip))) {
                DE_INIT(("init_hw - could not initialize DSP comm page\n"));
@@ -55,7 +56,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
        }
 
        chip->comm_page->e3g_frq_register =
-               __constant_cpu_to_le32((E3G_MAGIC_NUMBER / 48000) - 2);
+               cpu_to_le32((E3G_MAGIC_NUMBER / 48000) - 2);
        chip->device_id = device_id;
        chip->subdevice_id = subdevice_id;
        chip->bad_board = TRUE;
@@ -104,9 +105,11 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
        if ((err = init_line_levels(chip)) < 0)
                return err;
        err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
-       snd_assert(err >= 0, return err);
+       if (err < 0)
+               return err;
        err = set_phantom_power(chip, 0);
-       snd_assert(err >= 0, return err);
+       if (err < 0)
+               return err;
        err = set_professional_spdif(chip, TRUE);
 
        DE_INIT(("init_hw done\n"));