diff options
Diffstat (limited to 'sound/usb/endpoint.c')
| -rw-r--r-- | sound/usb/endpoint.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index b0ef9f50189..7d46e482375 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c | |||
| @@ -352,7 +352,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) | |||
| 352 | continue; | 352 | continue; |
| 353 | } | 353 | } |
| 354 | if (((protocol == UAC_VERSION_1) && (fmt->bLength < 8)) || | 354 | if (((protocol == UAC_VERSION_1) && (fmt->bLength < 8)) || |
| 355 | ((protocol == UAC_VERSION_2) && (fmt->bLength != 6))) { | 355 | ((protocol == UAC_VERSION_2) && (fmt->bLength < 6))) { |
| 356 | snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n", | 356 | snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n", |
| 357 | dev->devnum, iface_no, altno); | 357 | dev->devnum, iface_no, altno); |
| 358 | continue; | 358 | continue; |
| @@ -408,6 +408,8 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) | |||
| 408 | /* doesn't set the sample rate attribute, but supports it */ | 408 | /* doesn't set the sample rate attribute, but supports it */ |
| 409 | fp->attributes |= UAC_EP_CS_ATTR_SAMPLE_RATE; | 409 | fp->attributes |= UAC_EP_CS_ATTR_SAMPLE_RATE; |
| 410 | break; | 410 | break; |
| 411 | case USB_ID(0x0763, 0x2001): /* M-Audio Quattro USB */ | ||
| 412 | case USB_ID(0x0763, 0x2012): /* M-Audio Fast Track Pro USB */ | ||
| 411 | case USB_ID(0x047f, 0x0ca1): /* plantronics headset */ | 413 | case USB_ID(0x047f, 0x0ca1): /* plantronics headset */ |
| 412 | case USB_ID(0x077d, 0x07af): /* Griffin iMic (note that there is | 414 | case USB_ID(0x077d, 0x07af): /* Griffin iMic (note that there is |
| 413 | an older model 77d:223) */ | 415 | an older model 77d:223) */ |