1 files changed, 15 insertions, 10 deletions

diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index 4d2631434dc8..b508bb360b97 100644
--- a/sound/pci/ice1712/revo.c
+++ b/sound/pci/ice1712/revo.c
@@ -1,7 +1,7 @@
 /*
  *   ALSA driver for ICEnsemble ICE1712 (Envy24)
  *
- *   Lowlevel functions for M-Audio Revolution 7.1
+ *   Lowlevel functions for M-Audio Audiophile 192, Revolution 7.1 and 5.1
  *
  *      Copyright (c) 2003 Takashi Iwai <tiwai@suse.de>
  *
@@ -48,7 +48,7 @@ static void revo_i2s_mclk_changed(struct snd_ice1712 *ice)
 }
 
 /*
- * change the rate of envy24HT, AK4355 and AK4381
+ * change the rate of Envy24HT, AK4355 and AK4381
  */
 static void revo_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate)
 {
@@ -83,8 +83,8 @@ static void revo_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate)
         tmp = snd_akm4xxx_get(ak, 0, reg);
         tmp &= ~(0x03 << shift);
         tmp |= dfs << shift;
-        // snd_akm4xxx_write(ak, 0, reg, tmp);
-        snd_akm4xxx_set(ak, 0, reg, tmp); /* the value is written in reset(0) */
+        /* snd_akm4xxx_write(ak, 0, reg, tmp); */
+        snd_akm4xxx_set(ak, 0, reg, tmp); /* value is written in reset(0) */
         snd_akm4xxx_reset(ak, 0);
 }
 
@@ -216,6 +216,7 @@ static const struct snd_akm4xxx_dac_channel revo51_dac[] = {
         AK_DAC("PCM Center Playback Volume", 1),
         AK_DAC("PCM LFE Playback Volume", 1),
         AK_DAC("PCM Rear Playback Volume", 2),
+        AK_DAC("PCM Headphone Volume", 2),
 };
 
 static const char *revo51_adc_input_names[] = {
@@ -279,7 +280,7 @@ static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {
 
 static struct snd_akm4xxx akm_revo51 __devinitdata = {
         .type = SND_AK4358,
-        .num_dacs = 6,
+        .num_dacs = 8,
         .ops = {
                 .set_rate_val = revo_set_rate_val
         },
@@ -508,7 +509,7 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
                 ice->gpio.i2s_mclk_changed = revo_i2s_mclk_changed;
                 break;
         case VT1724_SUBDEVICE_REVOLUTION51:
-                ice->num_total_dacs = 6;
+                ice->num_total_dacs = 8;
                 ice->num_total_adcs = 2;
                 break;
         case VT1724_SUBDEVICE_AUDIOPHILE192:
@@ -524,16 +525,20 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
         ak = ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL);
         if (! ak)
                 return -ENOMEM;
-        ice->akm_codecs = 2;
         switch (ice->eeprom.subvendor) {
         case VT1724_SUBDEVICE_REVOLUTION71:
                 ice->akm_codecs = 2;
-                if ((err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front, &akm_revo_front_priv, ice)) < 0)
+                err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front,
+                                                &akm_revo_front_priv, ice);
+                if (err < 0)
                         return err;
-                if ((err = snd_ice1712_akm4xxx_init(ak + 1, &akm_revo_surround, &akm_revo_surround_priv, ice)) < 0)
+                err = snd_ice1712_akm4xxx_init(ak+1, &akm_revo_surround,
+                                                &akm_revo_surround_priv, ice);
+                if (err < 0)
                         return err;
                 /* unmute all codecs */
-                snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE, VT1724_REVO_MUTE);
+                snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE,
+                                                VT1724_REVO_MUTE);
                 break;
         case VT1724_SUBDEVICE_REVOLUTION51:
                 ice->akm_codecs = 2;