diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-16 16:35:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-16 16:35:50 +0200 |
| commit | 15c2ac051c730210b7ef2c93807b576e89e129d2 (patch) | |
| tree | f0705accc9cf352d83102709ba5537825e42628f | |
| parent | 9d79b136910de2cf9e4f0e37c3048c0fc7d9eab3 (diff) | |
| parent | 8886f33f25083a47d5fa24ad7b57bb708c5c5403 (diff) | |
| download | linux-stable-15c2ac051c730210b7ef2c93807b576e89e129d2.tar.gz linux-stable-15c2ac051c730210b7ef2c93807b576e89e129d2.tar.bz2 linux-stable-15c2ac051c730210b7ef2c93807b576e89e129d2.zip | |
Merge branch 'fix/usb-audio' into for-linus
* fix/usb-audio:
sound: usb-audio: add workaround for Blue Microphones devices
| -rw-r--r-- | sound/usb/usbaudio.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index c7b902358b7b..44b9cdc8a83b 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -2661,7 +2661,7 @@ static int parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) struct usb_interface_descriptor *altsd; int i, altno, err, stream; int format; - struct audioformat *fp; + struct audioformat *fp = NULL; unsigned char *fmt, *csep; int num; @@ -2734,6 +2734,18 @@ static int parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) continue; } + /* + * Blue Microphones workaround: The last altsetting is identical + * with the previous one, except for a larger packet size, but + * is actually a mislabeled two-channel setting; ignore it. + */ + if (fmt[4] == 1 && fmt[5] == 2 && altno == 2 && num == 3 && + fp && fp->altsetting == 1 && fp->channels == 1 && + fp->format == SNDRV_PCM_FORMAT_S16_LE && + le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize) == + fp->maxpacksize * 2) + continue; + csep = snd_usb_find_desc(alts->endpoint[0].extra, alts->endpoint[0].extralen, NULL, USB_DT_CS_ENDPOINT); /* Creamware Noah has this descriptor after the 2nd endpoint */ if (!csep && altsd->bNumEndpoints >= 2) |