diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2006-11-20 14:14:39 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-01-09 09:06:15 +0100 |
| commit | 987411b7d899fd9b838d4ce32b45be0741c4ee22 (patch) | |
| tree | 606d3a67a3476910f6e56915fdad18df4a59c385 /sound/usb | |
| parent | [ALSA] Fix potential NULL pointer dereference in echoaudio midi (diff) | |
| download | linux-987411b7d899fd9b838d4ce32b45be0741c4ee22.tar.xz linux-987411b7d899fd9b838d4ce32b45be0741c4ee22.zip | |
[ALSA] usb-audio: work around wrong frequency in CM6501 descriptors
The C-Media CM6501 chip's descriptors say that altsetting 5 supports
48 kHz, but it actually plays at 96 kHz.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/usbaudio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 3d7f36fb4cf0..5f160eebd15c 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -2471,7 +2471,13 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform fp->nr_rates = nr_rates; fp->rate_min = fp->rate_max = combine_triple(&fmt[8]); for (r = 0, idx = offset + 1; r < nr_rates; r++, idx += 3) { - unsigned int rate = fp->rate_table[r] = combine_triple(&fmt[idx]); + unsigned int rate = combine_triple(&fmt[idx]); + /* C-Media CM6501 mislabels its 96 kHz altsetting */ + if (rate == 48000 && nr_rates == 1 && + chip->usb_id == USB_ID(0x0d8c, 0x0201) && + fp->altsetting == 5 && fp->maxpacksize == 392) + rate = 96000; + fp->rate_table[r] = rate; if (rate < fp->rate_min) fp->rate_min = rate; else if (rate > fp->rate_max) |