Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

1 files changed, 0 insertions, 12 deletions

diff --git a/sound/pci/echoaudio/indigodj_dsp.c b/sound/pci/echoaudio/indigodj_dsp.c
index 90730a5ecb42..08392916691e 100644
--- a/sound/pci/echoaudio/indigodj_dsp.c
+++ b/sound/pci/echoaudio/indigodj_dsp.c
@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         if ((err = init_line_levels(chip)) < 0)
                 return err;
 
-        /* Default routing of the virtual channels: vchannels 0-3 and
-        vchannels 4-7 are routed to real channels 0-4 */
-        set_vmixer_gain(chip, 0, 0, 0);
-        set_vmixer_gain(chip, 1, 1, 0);
-        set_vmixer_gain(chip, 2, 2, 0);
-        set_vmixer_gain(chip, 3, 3, 0);
-        set_vmixer_gain(chip, 0, 4, 0);
-        set_vmixer_gain(chip, 1, 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;
 }