diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2009-02-06 08:13:07 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-12 09:31:03 -0800 |
commit | 6106d9f94e0cf107af83b6514b1b193233314a33 (patch) | |
tree | 6d2c1800e36c329ce6df4e401fb3e1a73135dbe3 | |
parent | 2bba098bf6965d597db52ba6e377413b4cc24086 (diff) |
sound: usb-audio: handle wMaxPacketSize for FIXED_ENDPOINT devices
commit 894dcd78782842924527598b0b764c9b4e679e21 upstream.
For audio devices that do not have proper audio descriptors (e.g.,
Edirol UA-20), we use hardcoded parameters from our quirks list.
However, we must still read the maximum packet size from the standard
endpoint descriptor; otherwise, we might use packets that are too big
and therefore rejected by the USB core.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | sound/usb/usbaudio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index b8cfb7c22768..7a1a8c8245d0 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -2958,6 +2958,7 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, return -EINVAL; } alts = &iface->altsetting[fp->altset_idx]; + fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize); usb_set_interface(chip->dev, fp->iface, 0); init_usb_pitch(chip->dev, fp->iface, alts, fp); init_usb_sample_rate(chip->dev, fp->iface, alts, fp, fp->rate_max); |