aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2006-01-13 08:11:22 +0100
committerJaroslav Kysela <perex@suse.cz>2006-01-22 16:24:16 +0100
commit33159378254b67d0080a8d63197e95654b672cf7 (patch)
tree22b26de175b6da9b236d179d436e0c935842e34f /sound
parentfc80a2027afc31e8447a0691ea1279166ce5d69f (diff)
downloadkernel_samsung_smdk4412-33159378254b67d0080a8d63197e95654b672cf7.zip
kernel_samsung_smdk4412-33159378254b67d0080a8d63197e95654b672cf7.tar.gz
kernel_samsung_smdk4412-33159378254b67d0080a8d63197e95654b672cf7.tar.bz2
[ALSA] usb-audio: fix non-48k sample rates with SB Audigy 2 ZS
Modules: USB generic driver On the Audigy 2 ZS, disable all sample rate that are not a multiple of 48 kHz because the others work only with the digital output which is not yet supported. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/usbaudio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 9572973..d501338 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -2493,12 +2493,13 @@ static int parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fp
if (err < 0)
return err;
#if 1
- /* FIXME: temporary hack for extigy/audigy 2 nx */
+ /* FIXME: temporary hack for extigy/audigy 2 nx/zs */
/* extigy apparently supports sample rates other than 48k
* but not in ordinary way. so we enable only 48k atm.
*/
if (chip->usb_id == USB_ID(0x041e, 0x3000) ||
- chip->usb_id == USB_ID(0x041e, 0x3020)) {
+ chip->usb_id == USB_ID(0x041e, 0x3020) ||
+ chip->usb_id == USB_ID(0x041e, 0x3061)) {
if (fmt[3] == USB_FORMAT_TYPE_I &&
fp->rates != SNDRV_PCM_RATE_48000 &&
fp->rates != SNDRV_PCM_RATE_96000)