aboutsummaryrefslogtreecommitdiff
path: root/ubuntu
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2010-06-02 20:42:24 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:22:43 -0700
commit35e9c01d675b4dc285105371d0103374da96d72b (patch)
treea942ae10108d235261b3f23440c66d219fabeca8 /ubuntu
parent3547c3e0a339dc94042594e9f78e06c51e5aba86 (diff)
UBUNTU: ubuntu: ndiswrapper: rename usb_buffer_alloc() and usb_buffer_free()
usb_buffer_alloc() is renamed to usb_alloc_coherent() usb_buffer_free() is renamed to usb_free_coherent() This is due to the removal of the usb_buffer_alloc() and usb_buffer_free() macros: commit e26bcf37234c67624f62d9fc95f922b8dbda1363 Author: Greg Kroah-Hartman <gregkh@suse.de> Date: Thu Apr 29 15:46:07 2010 -0700 USB: remove unused usb_buffer_alloc and usb_buffer_free macros Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/ndiswrapper/usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ubuntu/ndiswrapper/usb.c b/ubuntu/ndiswrapper/usb.c
index f2ddfb4353a..0e6da84a10c 100644
--- a/ubuntu/ndiswrapper/usb.c
+++ b/ubuntu/ndiswrapper/usb.c
@@ -191,7 +191,7 @@ static void wrap_free_urb(struct urb *urb)
if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) {
USBTRACE("freeing DMA buffer for URB: %p %p",
urb, urb->transfer_buffer);
- usb_buffer_free(IRP_WRAP_DEVICE(irp)->usb.udev,
+ usb_free_coherent(IRP_WRAP_DEVICE(irp)->usb.udev,
urb->transfer_buffer_length,
urb->transfer_buffer, urb->transfer_dma);
}
@@ -304,7 +304,7 @@ static struct urb *wrap_alloc_urb(struct irp *irp, unsigned int pipe,
#endif
)) {
urb->transfer_buffer =
- usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags,
+ usb_alloc_coherent(wd->usb.udev, buf_len, alloc_flags,
&urb->transfer_dma);
if (!urb->transfer_buffer) {
WARNING("couldn't allocate dma buf");