]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
usb-audio: work around wrong frequency in CM6501 descriptors
authorClemens Ladisch <clemens@ladisch.de>
Wed, 28 Mar 2007 20:28:33 +0000 (22:28 +0200)
committerAdrian Bunk <bunk@stusta.de>
Wed, 28 Mar 2007 20:28:33 +0000 (22:28 +0200)
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
sound/usb/usbaudio.c

index d5013383fad71dec63557b5207cc38f08ba0578c..6bca3814f6e6f3a0ba64918bcafde74a3659484d 100644 (file)
@@ -2391,7 +2391,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)