aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2012-01-16 09:11:59 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-24 15:19:58 -0500
commit655e247daf52b202a6c2d0f8a06dd2051e756ce4 (patch)
tree9b2e12717ef616b99301b79396b44961d36b5ec3 /drivers/usb
parent62aaf24dc125d7c55c93e313d15611f152b030c7 (diff)
USB: cdc-wdm: better allocate a buffer that is at least as big as we tell the USB core
As it turns out, there was a mismatch between the allocated inbuf size (desc->bMaxPacketSize0, typically something like 64) and the length we specified in the URB (desc->wMaxCommand, typically something like 2048) Signed-off-by: Bjørn Mork <bjorn@mork.no> Cc: Oliver Neukum <oliver@neukum.org> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/class/cdc-wdm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 07aa67611b65..a940ad9d0d8f 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -723,7 +723,7 @@ next_desc:
723 goto err; 723 goto err;
724 724
725 desc->inbuf = usb_alloc_coherent(interface_to_usbdev(intf), 725 desc->inbuf = usb_alloc_coherent(interface_to_usbdev(intf),
726 desc->bMaxPacketSize0, 726 desc->wMaxCommand,
727 GFP_KERNEL, 727 GFP_KERNEL,
728 &desc->response->transfer_dma); 728 &desc->response->transfer_dma);
729 if (!desc->inbuf) 729 if (!desc->inbuf)