diff options
Diffstat (limited to 'drivers/input/tablet/aiptek.c')
-rw-r--r-- | drivers/input/tablet/aiptek.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c index e53c838f1866..1aa82e8af614 100644 --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c | |||
@@ -1706,20 +1706,21 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
1706 | aiptek = kzalloc(sizeof(struct aiptek), GFP_KERNEL); | 1706 | aiptek = kzalloc(sizeof(struct aiptek), GFP_KERNEL); |
1707 | inputdev = input_allocate_device(); | 1707 | inputdev = input_allocate_device(); |
1708 | if (!aiptek || !inputdev) { | 1708 | if (!aiptek || !inputdev) { |
1709 | warn("aiptek: cannot allocate memory or input device"); | 1709 | dev_warn(&intf->dev, |
1710 | "cannot allocate memory or input device\n"); | ||
1710 | goto fail1; | 1711 | goto fail1; |
1711 | } | 1712 | } |
1712 | 1713 | ||
1713 | aiptek->data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH, | 1714 | aiptek->data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH, |
1714 | GFP_ATOMIC, &aiptek->data_dma); | 1715 | GFP_ATOMIC, &aiptek->data_dma); |
1715 | if (!aiptek->data) { | 1716 | if (!aiptek->data) { |
1716 | warn("aiptek: cannot allocate usb buffer"); | 1717 | dev_warn(&intf->dev, "cannot allocate usb buffer\n"); |
1717 | goto fail1; | 1718 | goto fail1; |
1718 | } | 1719 | } |
1719 | 1720 | ||
1720 | aiptek->urb = usb_alloc_urb(0, GFP_KERNEL); | 1721 | aiptek->urb = usb_alloc_urb(0, GFP_KERNEL); |
1721 | if (!aiptek->urb) { | 1722 | if (!aiptek->urb) { |
1722 | warn("aiptek: cannot allocate urb"); | 1723 | dev_warn(&intf->dev, "cannot allocate urb\n"); |
1723 | goto fail2; | 1724 | goto fail2; |
1724 | } | 1725 | } |
1725 | 1726 | ||
@@ -1864,7 +1865,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
1864 | */ | 1865 | */ |
1865 | err = sysfs_create_group(&intf->dev.kobj, &aiptek_attribute_group); | 1866 | err = sysfs_create_group(&intf->dev.kobj, &aiptek_attribute_group); |
1866 | if (err) { | 1867 | if (err) { |
1867 | warn("aiptek: cannot create sysfs group err: %d", err); | 1868 | dev_warn(&intf->dev, "cannot create sysfs group err: %d\n", |
1869 | err); | ||
1868 | goto fail3; | 1870 | goto fail3; |
1869 | } | 1871 | } |
1870 | 1872 | ||
@@ -1872,7 +1874,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
1872 | */ | 1874 | */ |
1873 | err = input_register_device(aiptek->inputdev); | 1875 | err = input_register_device(aiptek->inputdev); |
1874 | if (err) { | 1876 | if (err) { |
1875 | warn("aiptek: input_register_device returned err: %d", err); | 1877 | dev_warn(&intf->dev, |
1878 | "input_register_device returned err: %d\n", err); | ||
1876 | goto fail4; | 1879 | goto fail4; |
1877 | } | 1880 | } |
1878 | return 0; | 1881 | return 0; |