5 files changed, 7 insertions, 10 deletions

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index d7e8ddd9a67..218d9854e5c 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -859,7 +859,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
 }
 
 static struct pci_driver oxygen_driver = {
-        .name = "CMI8788",
+        .name = KBUILD_MODNAME,
         .id_table = oxygen_ids,
         .probe = generic_oxygen_probe,
         .remove = __devexit_p(oxygen_pci_remove),
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 70b739816fc..82311fcb86f 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -655,7 +655,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
         chip->model.init(chip);
 
         err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED,
-                          DRIVER, chip);
+                          KBUILD_MODNAME, chip);
         if (err < 0) {
                 snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq);
                 goto err_card;
diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c
index d5533e34ece..cc0bcd9f335 100644
--- a/sound/pci/oxygen/oxygen_pcm.c
+++ b/sound/pci/oxygen/oxygen_pcm.c
@@ -168,12 +168,6 @@ static int oxygen_open(struct snd_pcm_substream *substream,
                 if (err < 0)
                         return err;
         }
-        if (channel == PCM_MULTICH) {
-                err = snd_pcm_hw_constraint_minmax
-                        (runtime, SNDRV_PCM_HW_PARAM_PERIOD_TIME, 0, 8192000);
-                if (err < 0)
-                        return err;
-        }
         snd_pcm_set_sync(substream);
         chip->streams[channel] = substream;
 
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 469010a8b84..773db794b43 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -88,7 +88,7 @@ static int __devinit xonar_probe(struct pci_dev *pci,
 }
 
 static struct pci_driver xonar_driver = {
-        .name = "AV200",
+        .name = KBUILD_MODNAME,
         .id_table = xonar_ids,
         .probe = xonar_probe,
         .remove = __devexit_p(oxygen_pci_remove),
diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
index 54cad38ec30..32d096c98f5 100644
--- a/sound/pci/oxygen/xonar_pcm179x.c
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -327,8 +327,10 @@ static void pcm1796_init(struct oxygen *chip)
 {
         struct xonar_pcm179x *data = chip->model_data;
 
-        data->pcm1796_regs[0][18 - PCM1796_REG_BASE] = PCM1796_MUTE |
+        data->pcm1796_regs[0][18 - PCM1796_REG_BASE] =
                 PCM1796_DMF_DISABLED | PCM1796_FMT_24_I2S | PCM1796_ATLD;
+        if (!data->broken_i2c)
+                data->pcm1796_regs[0][18 - PCM1796_REG_BASE] |= PCM1796_MUTE;
         data->pcm1796_regs[0][19 - PCM1796_REG_BASE] =
                 PCM1796_FLT_SHARP | PCM1796_ATS_1;
         data->pcm1796_regs[0][20 - PCM1796_REG_BASE] =
@@ -1123,6 +1125,7 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
                         chip->model.control_filter = xonar_st_h6_control_filter;
                         chip->model.dac_channels_pcm = 8;
                         chip->model.dac_channels_mixer = 8;
+                        chip->model.dac_volume_min = 255;
                         chip->model.dac_mclks = OXYGEN_MCLKS(256, 128, 128);
                         break;
                 }