Merge branch 'for-linus' into for-next

[deliverable/linux.git] / sound / usb / card.c

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 3fc63583a5372dbec8d09e7ba7cf7399abb54cd1..69860da473ea8b9d7ee853e9dfcdcc804690983f 100644 (file)
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -350,6 +350,7 @@ static int snd_usb_audio_create(struct usb_interface *intf,
        case USB_SPEED_HIGH:
        case USB_SPEED_WIRELESS:
        case USB_SPEED_SUPER:
+       case USB_SPEED_SUPER_PLUS:
                break;
        default:
                dev_err(&dev->dev, "unknown device speed %d\n", snd_usb_get_speed(dev));
@@ -450,6 +451,9 @@ static int snd_usb_audio_create(struct usb_interface *intf,
        case USB_SPEED_SUPER:
                strlcat(card->longname, ", super speed", sizeof(card->longname));
                break;
+       case USB_SPEED_SUPER_PLUS:
+               strlcat(card->longname, ", super speed plus", sizeof(card->longname));
+               break;
        default:
                break;
        }