diff options
Diffstat (limited to 'sound/usb/usbaudio.c')
-rw-r--r-- | sound/usb/usbaudio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 08c5efcf5be2..e4b91045ca16 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -2422,15 +2422,17 @@ static int parse_audio_format(struct usb_device *dev, struct audioformat *fp, | |||
2422 | if (err < 0) | 2422 | if (err < 0) |
2423 | return err; | 2423 | return err; |
2424 | #if 1 | 2424 | #if 1 |
2425 | /* FIXME: temporary hack for extigy */ | 2425 | /* FIXME: temporary hack for extigy/audigy 2 nx */ |
2426 | /* extigy apparently supports sample rates other than 48k | 2426 | /* extigy apparently supports sample rates other than 48k |
2427 | * but not in ordinary way. so we enable only 48k atm. | 2427 | * but not in ordinary way. so we enable only 48k atm. |
2428 | */ | 2428 | */ |
2429 | if (le16_to_cpu(dev->descriptor.idVendor) == 0x041e && | 2429 | if (le16_to_cpu(dev->descriptor.idVendor) == 0x041e && |
2430 | le16_to_cpu(dev->descriptor.idProduct) == 0x3000) { | 2430 | (le16_to_cpu(dev->descriptor.idProduct) == 0x3000 || |
2431 | le16_to_cpu(dev->descriptor.idProduct) == 0x3020)) { | ||
2431 | if (fmt[3] == USB_FORMAT_TYPE_I && | 2432 | if (fmt[3] == USB_FORMAT_TYPE_I && |
2432 | stream == SNDRV_PCM_STREAM_PLAYBACK && | 2433 | stream == SNDRV_PCM_STREAM_PLAYBACK && |
2433 | fp->rates != SNDRV_PCM_RATE_48000) | 2434 | fp->rates != SNDRV_PCM_RATE_48000 && |
2435 | fp->rates != SNDRV_PCM_RATE_96000) | ||
2434 | return -1; /* use 48k only */ | 2436 | return -1; /* use 48k only */ |
2435 | } | 2437 | } |
2436 | #endif | 2438 | #endif |