summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <martinez.javier@gmail.com>2011-01-02 15:11:43 +0100
committerJavier Martinez Canillas <martinez.javier@gmail.com>2011-01-08 01:32:22 +0100
commitbb4d1a2fc9b1d3afa333a684b6213883c2afc18c (patch)
tree568b066dcd0687ca885fd91160eecd68d51fdf0b
parente62e2ee0d7e8d61d95696fb65e14a7ca03cd37d1 (diff)
downloadldd3-bb4d1a2fc9b1d3afa333a684b6213883c2afc18c.tar.gz
usb-skeleton: Use usb_[alloc|free]_coherent instead of usb_buffer_[alloc|free]v2.6.35
-rw-r--r--usb/usb-skeleton.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usb/usb-skeleton.c b/usb/usb-skeleton.c
index 723deef..85861ab 100644
--- a/usb/usb-skeleton.c
+++ b/usb/usb-skeleton.c
@@ -145,7 +145,7 @@ static void skel_write_bulk_callback(struct urb *urb)
}
/* free up our allocated buffer */
- usb_buffer_free(urb->dev, urb->transfer_buffer_length,
+ usb_free_coherent(urb->dev, urb->transfer_buffer_length,
urb->transfer_buffer, urb->transfer_dma);
}
@@ -169,7 +169,7 @@ static ssize_t skel_write(struct file *file, const char __user *user_buffer, siz
goto error;
}
- buf = usb_buffer_alloc(dev->udev, count, GFP_KERNEL, &urb->transfer_dma);
+ buf = usb_alloc_coherent(dev->udev, count, GFP_KERNEL, &urb->transfer_dma);
if (!buf) {
retval = -ENOMEM;
goto error;
@@ -199,7 +199,7 @@ exit:
return count;
error:
- usb_buffer_free(dev->udev, count, buf, urb->transfer_dma);
+ usb_free_coherent(dev->udev, count, buf, urb->transfer_dma);
usb_free_urb(urb);
kfree(buf);
return retval;