summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/benq.c
diff options
context:
space:
mode:
authorDaniel Mack2010-04-12 13:17:25 +0200
committerGreg Kroah-Hartman2010-05-20 22:21:38 +0200
commit997ea58eb92f9970b8af7aae48800d0ef43b9423 (patch)
tree65e021973e5a48ad7290d5be1f441940566468ad /drivers/media/video/gspca/benq.c
parentUSB: Short new 'graph for usb-serial.txt (diff)
downloadkernel-qcow2-linux-997ea58eb92f9970b8af7aae48800d0ef43b9423.tar.gz
kernel-qcow2-linux-997ea58eb92f9970b8af7aae48800d0ef43b9423.tar.xz
kernel-qcow2-linux-997ea58eb92f9970b8af7aae48800d0ef43b9423.zip
USB: rename usb_buffer_alloc() and usb_buffer_free() users
For more clearance what the functions actually do, usb_buffer_alloc() is renamed to usb_alloc_coherent() usb_buffer_free() is renamed to usb_free_coherent() They should only be used in code which really needs DMA coherency. All call sites have been changed accordingly, except for staging drivers. Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Pedro Ribeiro <pedrib@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/media/video/gspca/benq.c')
-rw-r--r--drivers/media/video/gspca/benq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/benq.c b/drivers/media/video/gspca/benq.c
index 43ac4af8d3ed..fce8d9492641 100644
--- a/drivers/media/video/gspca/benq.c
+++ b/drivers/media/video/gspca/benq.c
@@ -117,13 +117,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
return -ENOMEM;
}
gspca_dev->urb[n] = urb;
- urb->transfer_buffer = usb_buffer_alloc(gspca_dev->dev,
+ urb->transfer_buffer = usb_alloc_coherent(gspca_dev->dev,
SD_PKT_SZ * SD_NPKT,
GFP_KERNEL,
&urb->transfer_dma);
if (urb->transfer_buffer == NULL) {
- err("usb_buffer_alloc failed");
+ err("usb_alloc_coherent failed");
return -ENOMEM;
}
urb->dev = gspca_dev->dev;