From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422783AbXCGRzt (ORCPT ); Wed, 7 Mar 2007 12:55:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1422770AbXCGROH (ORCPT ); Wed, 7 Mar 2007 12:14:07 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42762 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422769AbXCGRNj (ORCPT ); Wed, 7 Mar 2007 12:13:39 -0500 Message-Id: <20070307171202.363063760@mini.kroah.org> References: <20070307171035.150802805@mini.kroah.org> User-Agent: quilt/0.45-1 Date: Wed, 07 Mar 2007 09:10:49 -0800 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 , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Gregor Jasny , Takashi Iwai , Jaroslav Kysela Subject: [patch 014/101] USB audio fixes 1 Content-Disposition: inline; filename=usb-audio-fixes-1.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai [PATCH] usbaudio - Fix Oops with broken usb descriptors This is a patch for ALSA Bug #2724. Some webcams provide bogus settings with no valid rates. With this patch those are skipped. Signed-off-by: Gregor Jasny Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman --- sound/usb/usbaudio.c | 6 ++++++ 1 file changed, 6 insertions(+) --- linux-2.6.20.1.orig/sound/usb/usbaudio.c +++ linux-2.6.20.1/sound/usb/usbaudio.c @@ -2456,6 +2456,7 @@ static int parse_audio_format_rates(stru * build the rate table and bitmap flags */ int r, idx, c; + unsigned int nonzero_rates = 0; /* this table corresponds to the SNDRV_PCM_RATE_XXX bit */ static unsigned int conv_rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000, @@ -2478,6 +2479,7 @@ static int parse_audio_format_rates(stru fp->altsetting == 5 && fp->maxpacksize == 392) rate = 96000; fp->rate_table[r] = rate; + nonzero_rates |= rate; if (rate < fp->rate_min) fp->rate_min = rate; else if (rate > fp->rate_max) @@ -2493,6 +2495,10 @@ static int parse_audio_format_rates(stru if (!found) fp->needs_knot = 1; } + if (!nonzero_rates) { + hwc_debug("All rates were zero. Skipping format!\n"); + return -1; + } if (fp->needs_knot) fp->rates |= SNDRV_PCM_RATE_KNOT; } else { --