aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/format.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <anton@tuxera.com>2012-02-24 04:39:16 -0500
committerAnton Altaparmakov <anton@tuxera.com>2012-02-24 04:39:16 -0500
commit0afa1b62e33250d4777c5803a98ae69fbe872061 (patch)
tree1c747bc01b62bca85d277e2c8321ae6cf0006ed8 /sound/usb/format.c
parent97387e3baaf3c35ad560f8878e943c720a77da1b (diff)
parentbb4c7e9a9908548b458f34afb2fee74dc0d49f90 (diff)
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'sound/usb/format.c')
-rw-r--r--sound/usb/format.c4
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
209 return 0; 209 return 0;
210} 210}
211 211
212#define MAX_UAC2_NR_RATES 1024
213
214/* 212/*
215 * Helper function to walk the array of sample rate triplets reported by 213 * Helper function to walk the array of sample rate triplets reported by
216 * the device. The problem is that we need to parse whole array first to 214 * 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,
255 fp->rates |= snd_pcm_rate_to_rate_bit(rate); 253 fp->rates |= snd_pcm_rate_to_rate_bit(rate);
256 254
257 nr_rates++; 255 nr_rates++;
258 if (nr_rates >= MAX_UAC2_NR_RATES) { 256 if (nr_rates >= MAX_NR_RATES) {
259 snd_printk(KERN_ERR "invalid uac2 rates\n"); 257 snd_printk(KERN_ERR "invalid uac2 rates\n");
260 break; 258 break;
261 } 259 }