Merge commit 'v2.6.30' into for-2.6.31

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

diff --git a/sound/pci/echoaudio/mia_dsp.c b/sound/pci/echoaudio/mia_dsp.c
index 3eca16c..5514051 100644 (file)
--- a/sound/pci/echoaudio/mia_dsp.c
+++ b/sound/pci/echoaudio/mia_dsp.c
@@ -69,18 +69,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
        if ((err = init_line_levels(chip)))
                return err;
 
-       /* Default routing of the virtual channels: vchannels 0-3 go to analog
-       outputs and vchannels 4-7 go to S/PDIF outputs */
-       set_vmixer_gain(chip, 0, 0, 0);
-       set_vmixer_gain(chip, 1, 1, 0);
-       set_vmixer_gain(chip, 0, 2, 0);
-       set_vmixer_gain(chip, 1, 3, 0);
-       set_vmixer_gain(chip, 2, 4, 0);
-       set_vmixer_gain(chip, 3, 5, 0);
-       set_vmixer_gain(chip, 2, 6, 0);
-       set_vmixer_gain(chip, 3, 7, 0);
-       err = update_vmixer_level(chip);
-
        DE_INIT(("init_hw done\n"));
        return err;
 }