diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2006-01-13 02:11:22 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-22 10:24:16 -0500 |
commit | 33159378254b67d0080a8d63197e95654b672cf7 (patch) | |
tree | 22b26de175b6da9b236d179d436e0c935842e34f | |
parent | fc80a2027afc31e8447a0691ea1279166ce5d69f (diff) |
[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>
-rw-r--r-- | sound/usb/usbaudio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 95729730bcdc..d5013383fad7 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 | |||
2493 | if (err < 0) | 2493 | if (err < 0) |
2494 | return err; | 2494 | return err; |
2495 | #if 1 | 2495 | #if 1 |
2496 | /* FIXME: temporary hack for extigy/audigy 2 nx */ | 2496 | /* FIXME: temporary hack for extigy/audigy 2 nx/zs */ |
2497 | /* extigy apparently supports sample rates other than 48k | 2497 | /* extigy apparently supports sample rates other than 48k |
2498 | * but not in ordinary way. so we enable only 48k atm. | 2498 | * but not in ordinary way. so we enable only 48k atm. |
2499 | */ | 2499 | */ |
2500 | if (chip->usb_id == USB_ID(0x041e, 0x3000) || | 2500 | if (chip->usb_id == USB_ID(0x041e, 0x3000) || |
2501 | chip->usb_id == USB_ID(0x041e, 0x3020)) { | 2501 | chip->usb_id == USB_ID(0x041e, 0x3020) || |
2502 | chip->usb_id == USB_ID(0x041e, 0x3061)) { | ||
2502 | if (fmt[3] == USB_FORMAT_TYPE_I && | 2503 | if (fmt[3] == USB_FORMAT_TYPE_I && |
2503 | fp->rates != SNDRV_PCM_RATE_48000 && | 2504 | fp->rates != SNDRV_PCM_RATE_48000 && |
2504 | fp->rates != SNDRV_PCM_RATE_96000) | 2505 | fp->rates != SNDRV_PCM_RATE_96000) |