diff options
Diffstat (limited to 'drivers/input/tablet/wacom_sys.c')
-rw-r--r-- | drivers/input/tablet/wacom_sys.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index f46502589e4e..191197cd83e3 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
@@ -556,8 +556,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
556 | goto fail1; | 556 | goto fail1; |
557 | } | 557 | } |
558 | 558 | ||
559 | wacom_wac->data = usb_buffer_alloc(dev, WACOM_PKGLEN_MAX, | 559 | wacom_wac->data = usb_alloc_coherent(dev, WACOM_PKGLEN_MAX, |
560 | GFP_KERNEL, &wacom->data_dma); | 560 | GFP_KERNEL, &wacom->data_dma); |
561 | if (!wacom_wac->data) { | 561 | if (!wacom_wac->data) { |
562 | error = -ENOMEM; | 562 | error = -ENOMEM; |
563 | goto fail1; | 563 | goto fail1; |
@@ -633,7 +633,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
633 | return 0; | 633 | return 0; |
634 | 634 | ||
635 | fail3: usb_free_urb(wacom->irq); | 635 | fail3: usb_free_urb(wacom->irq); |
636 | fail2: usb_buffer_free(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma); | 636 | fail2: usb_free_coherent(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma); |
637 | fail1: input_free_device(input_dev); | 637 | fail1: input_free_device(input_dev); |
638 | kfree(wacom); | 638 | kfree(wacom); |
639 | kfree(wacom_wac); | 639 | kfree(wacom_wac); |
@@ -649,8 +649,8 @@ static void wacom_disconnect(struct usb_interface *intf) | |||
649 | usb_kill_urb(wacom->irq); | 649 | usb_kill_urb(wacom->irq); |
650 | input_unregister_device(wacom->dev); | 650 | input_unregister_device(wacom->dev); |
651 | usb_free_urb(wacom->irq); | 651 | usb_free_urb(wacom->irq); |
652 | usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX, | 652 | usb_free_coherent(interface_to_usbdev(intf), WACOM_PKGLEN_MAX, |
653 | wacom->wacom_wac->data, wacom->data_dma); | 653 | wacom->wacom_wac->data, wacom->data_dma); |
654 | kfree(wacom->wacom_wac); | 654 | kfree(wacom->wacom_wac); |
655 | kfree(wacom); | 655 | kfree(wacom); |
656 | } | 656 | } |