Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[sfrench/cifs-2.6.git] / sound / usb / format.c

diff --git a/sound/usb/format.c b/sound/usb/format.c
index 4387f54d73db2c65fb04fbcdf031d4c19aa91dab..3a1375459c06a49d0d48a309460af30a0fcfd8c0 100644 (file)
--- 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,
                /* fp->channels is already set in this case */
                ret = parse_audio_format_rates_v2(chip, fp);
                break;
+       default:
+               snd_printk(KERN_ERR "%d:%u:%d : invalid protocol version %d\n",
+                          chip->dev->devnum, fp->iface, fp->altsetting, protocol);
+               return -EINVAL;
        }
 
        if (fp->channels < 1) {
@@ -452,6 +456,10 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip,
                ret = parse_audio_format_rates_v2(chip, fp);
                break;
        }
+       default:
+               snd_printk(KERN_ERR "%d:%u:%d : invalid protocol version %d\n",
+                          chip->dev->devnum, fp->iface, fp->altsetting, protocol);
+               return -EINVAL;
        }
 
        return ret;