summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-06-27 08:18:27 +0200
committerJaroslav Kysela <perex@suse.cz>2005-07-28 12:09:26 +0200
commitb4d3f9d452ec574e0ffb292267427f69bb470631 (patch)
tree2faa1200795b4f96a547d196eaac78f2040ea92c /sound/usb
parent573567e07bb4470ff177f17d1adca3f3bd310221 (diff)
downloadlinux-stable-b4d3f9d452ec574e0ffb292267427f69bb470631.tar.gz
linux-stable-b4d3f9d452ec574e0ffb292267427f69bb470631.tar.bz2
linux-stable-b4d3f9d452ec574e0ffb292267427f69bb470631.zip
[ALSA] usb-audio - fix capture of non-48k sample rates on Audigy 2 NX
USB generic driver On the SB Audigy 2 NX, capturing with sample rates that are not a multiple of 48 kHz does not seem to work, so disable it. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usbaudio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index facd9fc11c3c..c57b44511b54 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -2408,10 +2408,9 @@ static int parse_audio_format(snd_usb_audio_t *chip, struct audioformat *fp,
if (chip->usb_id == USB_ID(0x041e, 0x3000) ||
chip->usb_id == USB_ID(0x041e, 0x3020)) {
if (fmt[3] == USB_FORMAT_TYPE_I &&
- stream == SNDRV_PCM_STREAM_PLAYBACK &&
fp->rates != SNDRV_PCM_RATE_48000 &&
fp->rates != SNDRV_PCM_RATE_96000)
- return -1; /* use 48k only */
+ return -1;
}
#endif
return 0;