diff options
Diffstat (limited to 'drivers/usb/misc/usbtest.c')
-rw-r--r-- | drivers/usb/misc/usbtest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index 9dcc82337ced..16dffe99d9f1 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c | |||
@@ -202,7 +202,7 @@ static struct urb *simple_alloc_urb ( | |||
202 | urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; | 202 | urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; |
203 | if (usb_pipein (pipe)) | 203 | if (usb_pipein (pipe)) |
204 | urb->transfer_flags |= URB_SHORT_NOT_OK; | 204 | urb->transfer_flags |= URB_SHORT_NOT_OK; |
205 | urb->transfer_buffer = usb_buffer_alloc (udev, bytes, GFP_KERNEL, | 205 | urb->transfer_buffer = usb_alloc_coherent (udev, bytes, GFP_KERNEL, |
206 | &urb->transfer_dma); | 206 | &urb->transfer_dma); |
207 | if (!urb->transfer_buffer) { | 207 | if (!urb->transfer_buffer) { |
208 | usb_free_urb (urb); | 208 | usb_free_urb (urb); |
@@ -272,8 +272,8 @@ static inline int simple_check_buf(struct usbtest_dev *tdev, struct urb *urb) | |||
272 | 272 | ||
273 | static void simple_free_urb (struct urb *urb) | 273 | static void simple_free_urb (struct urb *urb) |
274 | { | 274 | { |
275 | usb_buffer_free (urb->dev, urb->transfer_buffer_length, | 275 | usb_free_coherent(urb->dev, urb->transfer_buffer_length, |
276 | urb->transfer_buffer, urb->transfer_dma); | 276 | urb->transfer_buffer, urb->transfer_dma); |
277 | usb_free_urb (urb); | 277 | usb_free_urb (urb); |
278 | } | 278 | } |
279 | 279 | ||
@@ -1416,7 +1416,7 @@ static struct urb *iso_alloc_urb ( | |||
1416 | 1416 | ||
1417 | urb->number_of_packets = packets; | 1417 | urb->number_of_packets = packets; |
1418 | urb->transfer_buffer_length = bytes; | 1418 | urb->transfer_buffer_length = bytes; |
1419 | urb->transfer_buffer = usb_buffer_alloc (udev, bytes, GFP_KERNEL, | 1419 | urb->transfer_buffer = usb_alloc_coherent (udev, bytes, GFP_KERNEL, |
1420 | &urb->transfer_dma); | 1420 | &urb->transfer_dma); |
1421 | if (!urb->transfer_buffer) { | 1421 | if (!urb->transfer_buffer) { |
1422 | usb_free_urb (urb); | 1422 | usb_free_urb (urb); |