aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/card.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/card.c')
-rw-r--r--sound/usb/card.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 8018d56cfecc..4a1c6bb3dfa0 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -7,6 +7,7 @@
7 * Alan Cox (alan@lxorguk.ukuu.org.uk) 7 * Alan Cox (alan@lxorguk.ukuu.org.uk)
8 * Thomas Sailer (sailer@ife.ee.ethz.ch) 8 * Thomas Sailer (sailer@ife.ee.ethz.ch)
9 * 9 *
10 * Audio Class 3.0 support by Ruslan Bilovol <ruslan.bilovol@gmail.com>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
@@ -44,6 +45,7 @@
44#include <linux/mutex.h> 45#include <linux/mutex.h>
45#include <linux/usb/audio.h> 46#include <linux/usb/audio.h>
46#include <linux/usb/audio-v2.h> 47#include <linux/usb/audio-v2.h>
48#include <linux/usb/audio-v3.h>
47#include <linux/module.h> 49#include <linux/module.h>
48 50
49#include <sound/control.h> 51#include <sound/control.h>
@@ -281,7 +283,8 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
281 break; 283 break;
282 } 284 }
283 285
284 case UAC_VERSION_2: { 286 case UAC_VERSION_2:
287 case UAC_VERSION_3: {
285 struct usb_interface_assoc_descriptor *assoc = 288 struct usb_interface_assoc_descriptor *assoc =
286 usb_ifnum_to_if(dev, ctrlif)->intf_assoc; 289 usb_ifnum_to_if(dev, ctrlif)->intf_assoc;
287 290
@@ -301,7 +304,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
301 } 304 }
302 305
303 if (!assoc) { 306 if (!assoc) {
304 dev_err(&dev->dev, "Audio class v2 interfaces need an interface association\n"); 307 dev_err(&dev->dev, "Audio class v2/v3 interfaces need an interface association\n");
305 return -EINVAL; 308 return -EINVAL;
306 } 309 }
307 310