Merge branch 'topic/echoaudio' into for-linus

diff --combined sound/pci/echoaudio/echoaudio.c
index 9d015a76eb691c6ed8cba64e58b6d3b8f810d4b8,4b70ea1e4c9fa3dc903dec8cf69235c97c2173ad..da2065cd2c0d5c3ffd5783b98c90ebfbc4ee244c
--- 1/sound/pci/echoaudio/echoaudio.c
--- 2/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@@ -950,6 -950,8 +950,8 @@@ static int __devinit snd_echo_new_pcm(s
        Control interface
  ******************************************************************************/
  
+ #ifndef ECHOCARD_HAS_VMIXER
+ 
  /******************* PCM output volume *******************/
  static int snd_echo_output_gain_info(struct snd_kcontrol *kcontrol,
                                     struct snd_ctl_elem_info *uinfo)
@@@ -1001,18 -1003,6 +1003,6 @@@ static int snd_echo_output_gain_put(str
        return changed;
  }
  
- #ifdef ECHOCARD_HAS_VMIXER
- /* On Vmixer cards this one controls the line-out volume */
- static struct snd_kcontrol_new snd_echo_line_output_gain __devinitdata = {
-       .name = "Line Playback Volume",
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-       .info = snd_echo_output_gain_info,
-       .get = snd_echo_output_gain_get,
-       .put = snd_echo_output_gain_put,
-       .tlv = {.p = db_scale_output_gain},
- };
- #else
  static struct snd_kcontrol_new snd_echo_pcm_output_gain __devinitdata = {
        .name = "PCM Playback Volume",
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@@ -1022,6 -1012,7 +1012,7 @@@
        .put = snd_echo_output_gain_put,
        .tlv = {.p = db_scale_output_gain},
  };
+ 
  #endif
  
  
@@@ -1997,9 -1988,9 +1988,9 @@@ static int __devinit snd_echo_probe(str
  
        DE_INIT(("Echoaudio driver starting...\n"));
        i = 0;
 -      card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
 -      if (card == NULL)
 -              return -ENOMEM;
 +      err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
 +      if (err < 0)
 +              return err;
  
        snd_card_set_dev(card, &pci->dev);
  
@@@ -2037,8 -2028,6 +2028,6 @@@
  
  #ifdef ECHOCARD_HAS_VMIXER
        snd_echo_vmixer.count = num_pipes_out(chip) * num_busses_out(chip);
-       if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_echo_line_output_gain, chip))) < 0)
-               goto ctl_error;
        if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_echo_vmixer, chip))) < 0)
                goto ctl_error;
  #else

diff --combined sound/pci/echoaudio/mia_dsp.c
index 3eca16cb7f7142378d8aeb8c45a35e705afc678c,f7abe1b60a1d2dc224615e63ca2992c39ddecff1..551405114cbc67a33f04f0bf3fa37038ce1b32b7
--- 1/sound/pci/echoaudio/mia_dsp.c
--- 2/sound/pci/echoaudio/mia_dsp.c
+++ b/sound/pci/echoaudio/mia_dsp.c
@@@ -69,18 -69,6 +69,6 @@@ static int init_hw(struct echoaudio *ch
        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;
  }
@@@ -222,10 -210,10 +210,10 @@@ static int set_professional_spdif(struc
        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);
  }