aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet/wacom_sys.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/tablet/wacom_sys.c')
-rw-r--r--drivers/input/tablet/wacom_sys.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index d90f4e00e51d..2dc0c07c0469 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -465,8 +465,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
465 goto fail1; 465 goto fail1;
466 } 466 }
467 467
468 wacom_wac->data = usb_buffer_alloc(dev, WACOM_PKGLEN_MAX, 468 wacom_wac->data = usb_alloc_coherent(dev, WACOM_PKGLEN_MAX,
469 GFP_KERNEL, &wacom->data_dma); 469 GFP_KERNEL, &wacom->data_dma);
470 if (!wacom_wac->data) { 470 if (!wacom_wac->data) {
471 error = -ENOMEM; 471 error = -ENOMEM;
472 goto fail1; 472 goto fail1;
@@ -536,7 +536,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
536 536
537 fail4: wacom_remove_shared_data(wacom_wac); 537 fail4: wacom_remove_shared_data(wacom_wac);
538 fail3: usb_free_urb(wacom->irq); 538 fail3: usb_free_urb(wacom->irq);
539 fail2: usb_buffer_free(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma); 539 fail2: usb_free_coherent(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
540 fail1: input_free_device(input_dev); 540 fail1: input_free_device(input_dev);
541 kfree(wacom); 541 kfree(wacom);
542 return error; 542 return error;
@@ -551,7 +551,7 @@ static void wacom_disconnect(struct usb_interface *intf)
551 usb_kill_urb(wacom->irq); 551 usb_kill_urb(wacom->irq);
552 input_unregister_device(wacom->wacom_wac.input); 552 input_unregister_device(wacom->wacom_wac.input);
553 usb_free_urb(wacom->irq); 553 usb_free_urb(wacom->irq);
554 usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX, 554 usb_free_coherent(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
555 wacom->wacom_wac.data, wacom->data_dma); 555 wacom->wacom_wac.data, wacom->data_dma);
556 wacom_remove_shared_data(&wacom->wacom_wac); 556 wacom_remove_shared_data(&wacom->wacom_wac);
557 kfree(wacom); 557 kfree(wacom);