Merge branch 'fix/misc' into topic/misc

1 files changed, 8 insertions, 0 deletions

diff --git a/sound/usb/format.c b/sound/usb/format.c
index 4387f54d73d..3a1375459c0 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,
                 /* 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;