diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-02-16 16:43:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-02-16 16:43:09 +0100 |
| commit | 00bc0ce9130551ef193c3f5db0b7b6e70dff28ac (patch) | |
| tree | b6b022250a08073e522ed1bba56586b534a3c77e /sound/usb/format.c | |
| parent | a7f3eedc88b547e0ec35ba4cc4ae61cd9bc760ac (diff) | |
| parent | c14c95f62ecb8710af14ae0d48e01991b70bb6f4 (diff) | |
| download | linux-00bc0ce9130551ef193c3f5db0b7b6e70dff28ac.tar.bz2 | |
Merge branch 'fix/hda' into topic/hda
The fix for bitmap-overflow in Realtek codec driver is needed for the
further development of the auto-parser with badness evaluation.
Diffstat (limited to 'sound/usb/format.c')
| -rw-r--r-- | sound/usb/format.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/usb/format.c b/sound/usb/format.c index e09aba19375c..ddfef57c4c9f 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -209,8 +209,6 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof return 0; } -#define MAX_UAC2_NR_RATES 1024 - /* * Helper function to walk the array of sample rate triplets reported by * the device. The problem is that we need to parse whole array first to @@ -255,7 +253,7 @@ static int parse_uac2_sample_rate_range(struct audioformat *fp, int nr_triplets, fp->rates |= snd_pcm_rate_to_rate_bit(rate); nr_rates++; - if (nr_rates >= MAX_UAC2_NR_RATES) { + if (nr_rates >= MAX_NR_RATES) { snd_printk(KERN_ERR "invalid uac2 rates\n"); break; } |