Commit beb60119 authored by Gregor Jasny's avatar Gregor Jasny Committed by Jaroslav Kysela

[ALSA] 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: default avatarGregor Jasny <gjasny@web.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 4147dab6
...@@ -2463,6 +2463,7 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform ...@@ -2463,6 +2463,7 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
* build the rate table and bitmap flags * build the rate table and bitmap flags
*/ */
int r, idx, c; int r, idx, c;
unsigned int nonzero_rates = 0;
/* this table corresponds to the SNDRV_PCM_RATE_XXX bit */ /* this table corresponds to the SNDRV_PCM_RATE_XXX bit */
static unsigned int conv_rates[] = { static unsigned int conv_rates[] = {
5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000, 5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000,
...@@ -2485,6 +2486,7 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform ...@@ -2485,6 +2486,7 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
fp->altsetting == 5 && fp->maxpacksize == 392) fp->altsetting == 5 && fp->maxpacksize == 392)
rate = 96000; rate = 96000;
fp->rate_table[r] = rate; fp->rate_table[r] = rate;
nonzero_rates |= rate;
if (rate < fp->rate_min) if (rate < fp->rate_min)
fp->rate_min = rate; fp->rate_min = rate;
else if (rate > fp->rate_max) else if (rate > fp->rate_max)
...@@ -2500,6 +2502,10 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform ...@@ -2500,6 +2502,10 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
if (!found) if (!found)
fp->needs_knot = 1; fp->needs_knot = 1;
} }
if (!nonzero_rates) {
hwc_debug("All rates were zero. Skipping format!\n");
return -1;
}
if (fp->needs_knot) if (fp->needs_knot)
fp->rates |= SNDRV_PCM_RATE_KNOT; fp->rates |= SNDRV_PCM_RATE_KNOT;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment