Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106

diff --combined sound/pci/ca0106/ca0106_main.c
index 6ac1936,31b5b89..507abf3
--- 1/sound/pci/ca0106/ca0106_main.c
--- 2/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@@ -254,7 -254,7 +254,7 @@@ static struct snd_ca0106_details ca0106
           .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 +305,15 @@@ static struct snd_pcm_hardware snd_ca01
                                 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,