From eeb801f6b462257e7b491d664f215e70fc568b98 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Mon, 20 Nov 2006 14:14:39 +0100 Subject: [PATCH] --- yaml --- r: 45417 b: refs/heads/master c: 987411b7d899fd9b838d4ce32b45be0741c4ee22 h: refs/heads/master i: 45415: 097ad51ea7837ca5c424f65da1d0c79dc485ed3a v: v3 --- [refs] | 2 +- trunk/sound/usb/usbaudio.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 66b001b405ae..e2367be8d5c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5929546a96d55962bdcabae0c4e25dfcd9f1fda9 +refs/heads/master: 987411b7d899fd9b838d4ce32b45be0741c4ee22 diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c index 3d7f36fb4cf0..5f160eebd15c 100644 --- a/trunk/sound/usb/usbaudio.c +++ b/trunk/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)