summaryrefslogtreecommitdiffstats
path: root/sound/pci/ca0106
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-20 23:42:55 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-20 23:42:55 +0100
commit6a8436419d1b77b24d82bd90354adc4baa393566 (patch)
treed20e17b148f37dc299658a60303e6a2e4e6ce63f /sound/pci/ca0106
parentMerge branch 'topic/pcsp-fix' into topic/misc (diff)
parentALSA: ca0106 - disable 44.1kHz capture (diff)
downloadlinux-6a8436419d1b77b24d82bd90354adc4baa393566.tar.xz
linux-6a8436419d1b77b24d82bd90354adc4baa393566.zip
Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
Diffstat (limited to 'sound/pci/ca0106')
-rw-r--r--sound/pci/ca0106/ca0106_main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 6ac19364631b..507abf3d09a6 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -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,