aboutsummaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2010-06-02 23:42:24 -0400
committerLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-30 13:14:48 -0400
commitbf85fa63fefd9535644e918269f63913499ca2f7 (patch)
treed247e7c84331975c9a3d05f1cead2ba3a74e3c45 /ubuntu
parent00f703ae8e27cea68f3329444ee329b0e26048e1 (diff)
UBUNTU: SAUCE: 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)
191 if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) { 191 if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) {
192 USBTRACE("freeing DMA buffer for URB: %p %p", 192 USBTRACE("freeing DMA buffer for URB: %p %p",
193 urb, urb->transfer_buffer); 193 urb, urb->transfer_buffer);
194 usb_buffer_free(IRP_WRAP_DEVICE(irp)->usb.udev, 194 usb_free_coherent(IRP_WRAP_DEVICE(irp)->usb.udev,
195 urb->transfer_buffer_length, 195 urb->transfer_buffer_length,
196 urb->transfer_buffer, urb->transfer_dma); 196 urb->transfer_buffer, urb->transfer_dma);
197 } 197 }
@@ -304,7 +304,7 @@ static struct urb *wrap_alloc_urb(struct irp *irp, unsigned int pipe,
304#endif 304#endif
305 )) { 305 )) {
306 urb->transfer_buffer = 306 urb->transfer_buffer =
307 usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags, 307 usb_alloc_coherent(wd->usb.udev, buf_len, alloc_flags,
308 &urb->transfer_dma); 308 &urb->transfer_dma);
309 if (!urb->transfer_buffer) { 309 if (!urb->transfer_buffer) {
310 WARNING("couldn't allocate dma buf"); 310 WARNING("couldn't allocate dma buf");