Commit 748a1ccc authored May 04, 2016 by Oliver Neukum Committed by Takashi Iwai May 08, 2016

ALSA: usb-audio: correct speed checking



Allow handling SS+ USB devices correctly.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent dcd4f0db

sound/usb/card.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,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));
		@@ -451,6 +452,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;
		}

sound/usb/helper.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ unsigned char snd_usb_parse_datainterval(struct snd_usb_audio *chip,
		case USB_SPEED_HIGH:
		case USB_SPEED_WIRELESS:
		case USB_SPEED_SUPER:
		case USB_SPEED_SUPER_PLUS:
		if (get_endpoint(alts, 0)->bInterval >= 1 &&
		get_endpoint(alts, 0)->bInterval <= 4)
		return get_endpoint(alts, 0)->bInterval - 1;