diff options
Diffstat (limited to 'sound/usb/card.c')
-rw-r--r-- | sound/usb/card.c | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 4eabafa5b03..800f7cb4f25 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c | |||
@@ -300,9 +300,13 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx, | |||
300 | 300 | ||
301 | *rchip = NULL; | 301 | *rchip = NULL; |
302 | 302 | ||
303 | if (snd_usb_get_speed(dev) != USB_SPEED_LOW && | 303 | switch (snd_usb_get_speed(dev)) { |
304 | snd_usb_get_speed(dev) != USB_SPEED_FULL && | 304 | case USB_SPEED_LOW: |
305 | snd_usb_get_speed(dev) != USB_SPEED_HIGH) { | 305 | case USB_SPEED_FULL: |
306 | case USB_SPEED_HIGH: | ||
307 | case USB_SPEED_SUPER: | ||
308 | break; | ||
309 | default: | ||
306 | snd_printk(KERN_ERR "unknown device speed %d\n", snd_usb_get_speed(dev)); | 310 | snd_printk(KERN_ERR "unknown device speed %d\n", snd_usb_get_speed(dev)); |
307 | return -ENXIO; | 311 | return -ENXIO; |
308 | } | 312 | } |
@@ -378,11 +382,22 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx, | |||
378 | if (len < sizeof(card->longname)) | 382 | if (len < sizeof(card->longname)) |
379 | usb_make_path(dev, card->longname + len, sizeof(card->longname) - len); | 383 | usb_make_path(dev, card->longname + len, sizeof(card->longname) - len); |
380 | 384 | ||
381 | strlcat(card->longname, | 385 | switch (snd_usb_get_speed(dev)) { |
382 | snd_usb_get_speed(dev) == USB_SPEED_LOW ? ", low speed" : | 386 | case USB_SPEED_LOW: |
383 | snd_usb_get_speed(dev) == USB_SPEED_FULL ? ", full speed" : | 387 | strlcat(card->longname, ", low speed", sizeof(card->longname)); |
384 | ", high speed", | 388 | break; |
385 | sizeof(card->longname)); | 389 | case USB_SPEED_FULL: |
390 | strlcat(card->longname, ", full speed", sizeof(card->longname)); | ||
391 | break; | ||
392 | case USB_SPEED_HIGH: | ||
393 | strlcat(card->longname, ", high speed", sizeof(card->longname)); | ||
394 | break; | ||
395 | case USB_SPEED_SUPER: | ||
396 | strlcat(card->longname, ", super speed", sizeof(card->longname)); | ||
397 | break; | ||
398 | default: | ||
399 | break; | ||
400 | } | ||
386 | 401 | ||
387 | snd_usb_audio_create_proc(chip); | 402 | snd_usb_audio_create_proc(chip); |
388 | 403 | ||