diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-08-18 09:17:52 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-08-18 09:17:52 -0400 |
commit | e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5 (patch) | |
tree | 37c20ec03e70dc7b5df1d02f16b6ac38d8ed1364 /sound/usb | |
parent | 7ac03db84baa204d7d280401ed65842541ed1078 (diff) | |
parent | 56385a12d9bb9e173751f74b6c430742018cafc0 (diff) |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/format.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/usb/format.c b/sound/usb/format.c index 4387f54d73db..3a1375459c06 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c | |||
@@ -392,6 +392,10 @@ static int parse_audio_format_i(struct snd_usb_audio *chip, | |||
392 | /* fp->channels is already set in this case */ | 392 | /* fp->channels is already set in this case */ |
393 | ret = parse_audio_format_rates_v2(chip, fp); | 393 | ret = parse_audio_format_rates_v2(chip, fp); |
394 | break; | 394 | break; |
395 | default: | ||
396 | snd_printk(KERN_ERR "%d:%u:%d : invalid protocol version %d\n", | ||
397 | chip->dev->devnum, fp->iface, fp->altsetting, protocol); | ||
398 | return -EINVAL; | ||
395 | } | 399 | } |
396 | 400 | ||
397 | if (fp->channels < 1) { | 401 | if (fp->channels < 1) { |
@@ -452,6 +456,10 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip, | |||
452 | ret = parse_audio_format_rates_v2(chip, fp); | 456 | ret = parse_audio_format_rates_v2(chip, fp); |
453 | break; | 457 | break; |
454 | } | 458 | } |
459 | default: | ||
460 | snd_printk(KERN_ERR "%d:%u:%d : invalid protocol version %d\n", | ||
461 | chip->dev->devnum, fp->iface, fp->altsetting, protocol); | ||
462 | return -EINVAL; | ||
455 | } | 463 | } |
456 | 464 | ||
457 | return ret; | 465 | return ret; |