diff options
Diffstat (limited to 'drivers/usb/misc/iowarrior.c')
-rw-r--r-- | drivers/usb/misc/iowarrior.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index d3c852363883..7dc9d3c69984 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c | |||
@@ -239,8 +239,8 @@ static void iowarrior_write_callback(struct urb *urb) | |||
239 | __func__, status); | 239 | __func__, status); |
240 | } | 240 | } |
241 | /* free up our allocated buffer */ | 241 | /* free up our allocated buffer */ |
242 | usb_buffer_free(urb->dev, urb->transfer_buffer_length, | 242 | usb_free_coherent(urb->dev, urb->transfer_buffer_length, |
243 | urb->transfer_buffer, urb->transfer_dma); | 243 | urb->transfer_buffer, urb->transfer_dma); |
244 | /* tell a waiting writer the interrupt-out-pipe is available again */ | 244 | /* tell a waiting writer the interrupt-out-pipe is available again */ |
245 | atomic_dec(&dev->write_busy); | 245 | atomic_dec(&dev->write_busy); |
246 | wake_up_interruptible(&dev->write_wait); | 246 | wake_up_interruptible(&dev->write_wait); |
@@ -421,8 +421,8 @@ static ssize_t iowarrior_write(struct file *file, | |||
421 | dbg("%s Unable to allocate urb ", __func__); | 421 | dbg("%s Unable to allocate urb ", __func__); |
422 | goto error_no_urb; | 422 | goto error_no_urb; |
423 | } | 423 | } |
424 | buf = usb_buffer_alloc(dev->udev, dev->report_size, | 424 | buf = usb_alloc_coherent(dev->udev, dev->report_size, |
425 | GFP_KERNEL, &int_out_urb->transfer_dma); | 425 | GFP_KERNEL, &int_out_urb->transfer_dma); |
426 | if (!buf) { | 426 | if (!buf) { |
427 | retval = -ENOMEM; | 427 | retval = -ENOMEM; |
428 | dbg("%s Unable to allocate buffer ", __func__); | 428 | dbg("%s Unable to allocate buffer ", __func__); |
@@ -459,8 +459,8 @@ static ssize_t iowarrior_write(struct file *file, | |||
459 | break; | 459 | break; |
460 | } | 460 | } |
461 | error: | 461 | error: |
462 | usb_buffer_free(dev->udev, dev->report_size, buf, | 462 | usb_free_coherent(dev->udev, dev->report_size, buf, |
463 | int_out_urb->transfer_dma); | 463 | int_out_urb->transfer_dma); |
464 | error_no_buffer: | 464 | error_no_buffer: |
465 | usb_free_urb(int_out_urb); | 465 | usb_free_urb(int_out_urb); |
466 | error_no_urb: | 466 | error_no_urb: |