2 files changed, 15 insertions, 5 deletions

diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index 1c14ff424116..a6943cb0d209 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -664,10 +664,14 @@ struct snd_ca0106_pcm {
 struct snd_ca0106_details {
         u32 serial;
         char * name;
-        int ac97;
-        int gpio_type;
-        int i2c_adc;
-        int spi_dac;
+        int ac97;       /* ac97 = 0 -> Select MIC, Line in, TAD in, AUX in.
+                           ac97 = 1 -> Default to AC97 in. */
+        int gpio_type;  /* gpio_type = 1 -> shared mic-in/line-in
+                           gpio_type = 2 -> shared side-out/line-in. */
+        int i2c_adc;    /* with i2c_adc=1, the driver adds some capture volume
+                           controls, phone, mic, line-in and aux. */
+        int spi_dac;    /* spi_dac=1 adds the mute switch for each analog
+                           output, front, rear, etc. */
 };
 
 // definition of the chip-specific record
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 7ead6c8a85f1..3e6dda37ef21 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -254,7 +254,7 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
            .name   = "MSI K8N Diamond MB",
            .gpio_type = 2,
            .i2c_adc = 1,
-           .spi_dac = 2 } ,
+           .spi_dac = 1 } ,
          /* Shuttle XPC SD31P which has an onboard Creative Labs
           * Sound Blaster Live! 24-bit EAX
           * high-definition 7.1 audio processor".
@@ -305,9 +305,15 @@ static struct snd_pcm_hardware snd_ca0106_capture_hw = {
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_MMAP_VALID),
         .formats =              SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
+#if 0 /* FIXME: looks like 44.1kHz capture causes noisy output on 48kHz */
         .rates =                (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
                                  SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000),
         .rate_min =             44100,
+#else
+        .rates =                (SNDRV_PCM_RATE_48000 |
+                                 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000),
+        .rate_min =             48000,
+#endif /* FIXME */
         .rate_max =             192000,
         .channels_min =         2,
         .channels_max =         2,