diff options
Diffstat (limited to 'drivers/input/tablet/aiptek.c')
-rw-r--r-- | drivers/input/tablet/aiptek.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c index 4be039d7dcad..51b80b08d467 100644 --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c | |||
@@ -1711,8 +1711,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
1711 | goto fail1; | 1711 | goto fail1; |
1712 | } | 1712 | } |
1713 | 1713 | ||
1714 | aiptek->data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH, | 1714 | aiptek->data = usb_alloc_coherent(usbdev, AIPTEK_PACKET_LENGTH, |
1715 | GFP_ATOMIC, &aiptek->data_dma); | 1715 | GFP_ATOMIC, &aiptek->data_dma); |
1716 | if (!aiptek->data) { | 1716 | if (!aiptek->data) { |
1717 | dev_warn(&intf->dev, "cannot allocate usb buffer\n"); | 1717 | dev_warn(&intf->dev, "cannot allocate usb buffer\n"); |
1718 | goto fail1; | 1718 | goto fail1; |
@@ -1884,8 +1884,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
1884 | 1884 | ||
1885 | fail4: sysfs_remove_group(&intf->dev.kobj, &aiptek_attribute_group); | 1885 | fail4: sysfs_remove_group(&intf->dev.kobj, &aiptek_attribute_group); |
1886 | fail3: usb_free_urb(aiptek->urb); | 1886 | fail3: usb_free_urb(aiptek->urb); |
1887 | fail2: usb_buffer_free(usbdev, AIPTEK_PACKET_LENGTH, aiptek->data, | 1887 | fail2: usb_free_coherent(usbdev, AIPTEK_PACKET_LENGTH, aiptek->data, |
1888 | aiptek->data_dma); | 1888 | aiptek->data_dma); |
1889 | fail1: usb_set_intfdata(intf, NULL); | 1889 | fail1: usb_set_intfdata(intf, NULL); |
1890 | input_free_device(inputdev); | 1890 | input_free_device(inputdev); |
1891 | kfree(aiptek); | 1891 | kfree(aiptek); |
@@ -1909,9 +1909,9 @@ static void aiptek_disconnect(struct usb_interface *intf) | |||
1909 | input_unregister_device(aiptek->inputdev); | 1909 | input_unregister_device(aiptek->inputdev); |
1910 | sysfs_remove_group(&intf->dev.kobj, &aiptek_attribute_group); | 1910 | sysfs_remove_group(&intf->dev.kobj, &aiptek_attribute_group); |
1911 | usb_free_urb(aiptek->urb); | 1911 | usb_free_urb(aiptek->urb); |
1912 | usb_buffer_free(interface_to_usbdev(intf), | 1912 | usb_free_coherent(interface_to_usbdev(intf), |
1913 | AIPTEK_PACKET_LENGTH, | 1913 | AIPTEK_PACKET_LENGTH, |
1914 | aiptek->data, aiptek->data_dma); | 1914 | aiptek->data, aiptek->data_dma); |
1915 | kfree(aiptek); | 1915 | kfree(aiptek); |
1916 | } | 1916 | } |
1917 | } | 1917 | } |