diff options
Diffstat (limited to 'sound/usb/format.c')
-rw-r--r-- | sound/usb/format.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/usb/format.c b/sound/usb/format.c index 30364aba79cc..4387f54d73db 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c | |||
@@ -264,13 +264,12 @@ static int parse_uac2_sample_rate_range(struct audioformat *fp, int nr_triplets, | |||
264 | * on the audioformat table (audio class v2). | 264 | * on the audioformat table (audio class v2). |
265 | */ | 265 | */ |
266 | static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, | 266 | static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, |
267 | struct audioformat *fp, | 267 | struct audioformat *fp) |
268 | struct usb_host_interface *iface) | ||
269 | { | 268 | { |
270 | struct usb_device *dev = chip->dev; | 269 | struct usb_device *dev = chip->dev; |
271 | unsigned char tmp[2], *data; | 270 | unsigned char tmp[2], *data; |
272 | int nr_triplets, data_size, ret = 0; | 271 | int nr_triplets, data_size, ret = 0; |
273 | int clock = snd_usb_clock_find_source(chip, chip->ctrl_intf, fp->clock); | 272 | int clock = snd_usb_clock_find_source(chip, fp->clock); |
274 | 273 | ||
275 | if (clock < 0) { | 274 | if (clock < 0) { |
276 | snd_printk(KERN_ERR "%s(): unable to find clock source (clock %d)\n", | 275 | snd_printk(KERN_ERR "%s(): unable to find clock source (clock %d)\n", |
@@ -391,7 +390,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip, | |||
391 | break; | 390 | break; |
392 | case UAC_VERSION_2: | 391 | case UAC_VERSION_2: |
393 | /* fp->channels is already set in this case */ | 392 | /* fp->channels is already set in this case */ |
394 | ret = parse_audio_format_rates_v2(chip, fp, iface); | 393 | ret = parse_audio_format_rates_v2(chip, fp); |
395 | break; | 394 | break; |
396 | } | 395 | } |
397 | 396 | ||
@@ -450,7 +449,7 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip, | |||
450 | framesize = le16_to_cpu(fmt->wSamplesPerFrame); | 449 | framesize = le16_to_cpu(fmt->wSamplesPerFrame); |
451 | snd_printd(KERN_INFO "found format II with max.bitrate = %d, frame size=%d\n", brate, framesize); | 450 | snd_printd(KERN_INFO "found format II with max.bitrate = %d, frame size=%d\n", brate, framesize); |
452 | fp->frame_size = framesize; | 451 | fp->frame_size = framesize; |
453 | ret = parse_audio_format_rates_v2(chip, fp, iface); | 452 | ret = parse_audio_format_rates_v2(chip, fp); |
454 | break; | 453 | break; |
455 | } | 454 | } |
456 | } | 455 | } |