6 files changed, 46 insertions, 19 deletions

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 9feb00c831a0..498a2d8fa4bb 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -299,9 +299,13 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
 
         *rchip = NULL;
 
-        if (snd_usb_get_speed(dev) != USB_SPEED_LOW &&
-            snd_usb_get_speed(dev) != USB_SPEED_FULL &&
-            snd_usb_get_speed(dev) != USB_SPEED_HIGH) {
+        switch (snd_usb_get_speed(dev)) {
+        case USB_SPEED_LOW:
+        case USB_SPEED_FULL:
+        case USB_SPEED_HIGH:
+        case USB_SPEED_SUPER:
+                break;
+        default:
                 snd_printk(KERN_ERR "unknown device speed %d\n", snd_usb_get_speed(dev));
                 return -ENXIO;
         }
@@ -377,11 +381,22 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
         if (len < sizeof(card->longname))
                 usb_make_path(dev, card->longname + len, sizeof(card->longname) - len);
 
-        strlcat(card->longname,
-                snd_usb_get_speed(dev) == USB_SPEED_LOW ? ", low speed" :
-                snd_usb_get_speed(dev) == USB_SPEED_FULL ? ", full speed" :
-                ", high speed",
-                sizeof(card->longname));
+        switch (snd_usb_get_speed(dev)) {
+        case USB_SPEED_LOW:
+                strlcat(card->longname, ", low speed", sizeof(card->longname));
+                break;
+        case USB_SPEED_FULL:
+                strlcat(card->longname, ", full speed", sizeof(card->longname));
+                break;
+        case USB_SPEED_HIGH:
+                strlcat(card->longname, ", high speed", sizeof(card->longname));
+                break;
+        case USB_SPEED_SUPER:
+                strlcat(card->longname, ", super speed", sizeof(card->longname));
+                break;
+        default:
+                break;
+        }
 
         snd_usb_audio_create_proc(chip);
 
diff --git a/sound/usb/helper.c b/sound/usb/helper.c
index d48d6f8f6ac9..f280c1903c25 100644
--- a/sound/usb/helper.c
+++ b/sound/usb/helper.c
@@ -103,11 +103,16 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
 unsigned char snd_usb_parse_datainterval(struct snd_usb_audio *chip,
                                          struct usb_host_interface *alts)
 {
-        if (snd_usb_get_speed(chip->dev) == USB_SPEED_HIGH &&
-            get_endpoint(alts, 0)->bInterval >= 1 &&
-            get_endpoint(alts, 0)->bInterval <= 4)
-                return get_endpoint(alts, 0)->bInterval - 1;
-        else
-                return 0;
+        switch (snd_usb_get_speed(chip->dev)) {
+        case USB_SPEED_HIGH:
+        case USB_SPEED_SUPER:
+                if (get_endpoint(alts, 0)->bInterval >= 1 &&
+                    get_endpoint(alts, 0)->bInterval <= 4)
+                        return get_endpoint(alts, 0)->bInterval - 1;
+                break;
+        default:
+                break;
+        }
+        return 0;
 }
 
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index b9c2bc65f51a..156cd0716c42 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -834,7 +834,14 @@ static void snd_usbmidi_us122l_output(struct snd_usb_midi_out_endpoint *ep,
 
         if (!ep->ports[0].active)
                 return;
-        count = snd_usb_get_speed(ep->umidi->dev) == USB_SPEED_HIGH ? 1 : 2;
+        switch (snd_usb_get_speed(ep->umidi->dev)) {
+        case USB_SPEED_HIGH:
+        case USB_SPEED_SUPER:
+                count = 1;
+                break;
+        default:
+                count = 2;
+        }
         count = snd_rawmidi_transmit(ep->ports[0].substream,
                                      urb->transfer_buffer,
                                      count);
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 3634cedf9306..58ed6820a8cf 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -467,7 +467,7 @@ static int hw_check_valid_format(struct snd_usb_substream *subs,
                 return 0;
         }
         /* check whether the period time is >= the data packet interval */
-        if (snd_usb_get_speed(subs->dev) == USB_SPEED_HIGH) {
+        if (snd_usb_get_speed(subs->dev) != USB_SPEED_FULL) {
                 ptime = 125 * (1 << fp->datainterval);
                 if (ptime > pt->max || (ptime == pt->max && pt->openmax)) {
                         hwc_debug("   > check: ptime %u > max %u\n", ptime, pt->max);
@@ -735,7 +735,7 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre
         }
 
         param_period_time_if_needed = SNDRV_PCM_HW_PARAM_PERIOD_TIME;
-        if (snd_usb_get_speed(subs->dev) != USB_SPEED_HIGH)
+        if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL)
                 /* full speed devices have fixed data packet interval */
                 ptmin = 1000;
         if (ptmin == 1000)
diff --git a/sound/usb/proc.c b/sound/usb/proc.c
index f5e3f356b95f..3c650ab3c91d 100644
--- a/sound/usb/proc.c
+++ b/sound/usb/proc.c
@@ -107,7 +107,7 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s
                         }
                         snd_iprintf(buffer, "\n");
                 }
-                if (snd_usb_get_speed(subs->dev) == USB_SPEED_HIGH)
+                if (snd_usb_get_speed(subs->dev) != USB_SPEED_FULL)
                         snd_iprintf(buffer, "    Data packet interval: %d us\n",
                                     125 * (1 << fp->datainterval));
                 // snd_iprintf(buffer, "    Max Packet Size = %d\n", fp->maxpacksize);
diff --git a/sound/usb/urb.c b/sound/usb/urb.c
index de607d4411ac..8deeaad10f10 100644
--- a/sound/usb/urb.c
+++ b/sound/usb/urb.c
@@ -244,7 +244,7 @@ int snd_usb_init_substream_urbs(struct snd_usb_substream *subs,
         else
                 subs->curpacksize = maxsize;
 
-        if (snd_usb_get_speed(subs->dev) == USB_SPEED_HIGH)
+        if (snd_usb_get_speed(subs->dev) != USB_SPEED_FULL)
                 packs_per_ms = 8 >> subs->datainterval;
         else
                 packs_per_ms = 1;