Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763268AbZCNBck (ORCPT ); Fri, 13 Mar 2009 21:32:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753682AbZCNBUc (ORCPT ); Fri, 13 Mar 2009 21:20:32 -0400 Received: from kroah.org ([198.145.64.141]:35067 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753455AbZCNBUQ (ORCPT ); Fri, 13 Mar 2009 21:20:16 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Fri Mar 13 18:10:36 2009 Message-Id: <20090314011036.420604278@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Fri, 13 Mar 2009 18:10:11 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Joris van Rantwijk , Takashi Iwai Subject: [patch 034/114] ALSA: usb-audio - Workaround for misdetected sample rate with CM6207 References: <20090314010937.416083662@mini.kroah.org> Content-Disposition: inline; filename=alsa-usb-audio-workaround-for-misdetected-sample-rate-with-cm6207.patch In-Reply-To: <20090314011649.GA26170@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1430 Lines: 31 2.6.28-stable review patch. If anyone has any objections, please let us know. ------------------ From: Joris van Rantwijk commit 3b03cc5b86e2052295b9b484f37226ee15c87924 upstream. The CM6207 incorrectly advertises its 96 kHz playback setting as 48 kHz in its USB device descriptor. This patch extends an existing workaround in usbaudio.c to also cover the CM6207. This resolves issue 0004249 in the ALSA bug tracker. Signed-off-by: Joris van Rantwijk Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/usbaudio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -2539,7 +2539,8 @@ static int parse_audio_format_rates(stru continue; /* C-Media CM6501 mislabels its 96 kHz altsetting */ if (rate == 48000 && nr_rates == 1 && - chip->usb_id == USB_ID(0x0d8c, 0x0201) && + (chip->usb_id == USB_ID(0x0d8c, 0x0201) || + chip->usb_id == USB_ID(0x0d8c, 0x0102)) && fp->altsetting == 5 && fp->maxpacksize == 392) rate = 96000; fp->rate_table[fp->nr_rates] = rate; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/