diff options
Diffstat (limited to 'drivers/input/misc/cm109.c')
-rw-r--r-- | drivers/input/misc/cm109.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c index 8d2d291ee508..2b0eba6619bd 100644 --- a/drivers/input/misc/cm109.c +++ b/drivers/input/misc/cm109.c | |||
@@ -630,11 +630,11 @@ static void cm109_usb_cleanup(struct cm109_dev *dev) | |||
630 | { | 630 | { |
631 | kfree(dev->ctl_req); | 631 | kfree(dev->ctl_req); |
632 | if (dev->ctl_data) | 632 | if (dev->ctl_data) |
633 | usb_buffer_free(dev->udev, USB_PKT_LEN, | 633 | usb_free_coherent(dev->udev, USB_PKT_LEN, |
634 | dev->ctl_data, dev->ctl_dma); | 634 | dev->ctl_data, dev->ctl_dma); |
635 | if (dev->irq_data) | 635 | if (dev->irq_data) |
636 | usb_buffer_free(dev->udev, USB_PKT_LEN, | 636 | usb_free_coherent(dev->udev, USB_PKT_LEN, |
637 | dev->irq_data, dev->irq_dma); | 637 | dev->irq_data, dev->irq_dma); |
638 | 638 | ||
639 | usb_free_urb(dev->urb_irq); /* parameter validation in core/urb */ | 639 | usb_free_urb(dev->urb_irq); /* parameter validation in core/urb */ |
640 | usb_free_urb(dev->urb_ctl); /* parameter validation in core/urb */ | 640 | usb_free_urb(dev->urb_ctl); /* parameter validation in core/urb */ |
@@ -683,13 +683,13 @@ static int cm109_usb_probe(struct usb_interface *intf, | |||
683 | goto err_out; | 683 | goto err_out; |
684 | 684 | ||
685 | /* allocate usb buffers */ | 685 | /* allocate usb buffers */ |
686 | dev->irq_data = usb_buffer_alloc(udev, USB_PKT_LEN, | 686 | dev->irq_data = usb_alloc_coherent(udev, USB_PKT_LEN, |
687 | GFP_KERNEL, &dev->irq_dma); | 687 | GFP_KERNEL, &dev->irq_dma); |
688 | if (!dev->irq_data) | 688 | if (!dev->irq_data) |
689 | goto err_out; | 689 | goto err_out; |
690 | 690 | ||
691 | dev->ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN, | 691 | dev->ctl_data = usb_alloc_coherent(udev, USB_PKT_LEN, |
692 | GFP_KERNEL, &dev->ctl_dma); | 692 | GFP_KERNEL, &dev->ctl_dma); |
693 | if (!dev->ctl_data) | 693 | if (!dev->ctl_data) |
694 | goto err_out; | 694 | goto err_out; |
695 | 695 | ||