diff options
| author | Tomoki Sekiyama <tomoki.sekiyama@gmail.com> | 2012-03-30 08:51:28 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-27 09:51:06 -0700 |
| commit | 2079aa84102f13a77d846b5e72c7cf2fa5bb0737 (patch) | |
| tree | 27640b62e4a80b21718e44e4c8627f758af7aa13 /drivers/usb/misc | |
| parent | 06a3bbbe704048f4f8b08a0aea32418299c67555 (diff) | |
| download | kernel_samsung_smdk4412-2079aa84102f13a77d846b5e72c7cf2fa5bb0737.zip kernel_samsung_smdk4412-2079aa84102f13a77d846b5e72c7cf2fa5bb0737.tar.gz kernel_samsung_smdk4412-2079aa84102f13a77d846b5e72c7cf2fa5bb0737.tar.bz2 | |
USB: yurex: Remove allocation of coherent buffer for setup-packet buffer
commit 523fc5c14f6cad283e5a266eba0e343aed6e73d5 upstream.
Removes allocation of coherent buffer for the control-request setup-packet
buffer from the yurex driver. Using coherent buffers for setup-packet is
obsolete and does not work with some USB host implementations.
Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc')
| -rw-r--r-- | drivers/usb/misc/yurex.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c index ac5bfd6..24bff37 100644 --- a/drivers/usb/misc/yurex.c +++ b/drivers/usb/misc/yurex.c @@ -99,9 +99,7 @@ static void yurex_delete(struct kref *kref) usb_put_dev(dev->udev); if (dev->cntl_urb) { usb_kill_urb(dev->cntl_urb); - if (dev->cntl_req) - usb_free_coherent(dev->udev, YUREX_BUF_SIZE, - dev->cntl_req, dev->cntl_urb->setup_dma); + kfree(dev->cntl_req); if (dev->cntl_buffer) usb_free_coherent(dev->udev, YUREX_BUF_SIZE, dev->cntl_buffer, dev->cntl_urb->transfer_dma); @@ -234,9 +232,7 @@ static int yurex_probe(struct usb_interface *interface, const struct usb_device_ } /* allocate buffer for control req */ - dev->cntl_req = usb_alloc_coherent(dev->udev, YUREX_BUF_SIZE, - GFP_KERNEL, - &dev->cntl_urb->setup_dma); + dev->cntl_req = kmalloc(YUREX_BUF_SIZE, GFP_KERNEL); if (!dev->cntl_req) { err("Could not allocate cntl_req"); goto error; |