diff options
Diffstat (limited to 'drivers/input/tablet/kbtab.c')
-rw-r--r-- | drivers/input/tablet/kbtab.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c index 85a5b40333a..3fba74b9b60 100644 --- a/drivers/input/tablet/kbtab.c +++ b/drivers/input/tablet/kbtab.c | |||
@@ -33,6 +33,7 @@ struct kbtab { | |||
33 | dma_addr_t data_dma; | 33 | dma_addr_t data_dma; |
34 | struct input_dev *dev; | 34 | struct input_dev *dev; |
35 | struct usb_device *usbdev; | 35 | struct usb_device *usbdev; |
36 | struct usb_interface *intf; | ||
36 | struct urb *irq; | 37 | struct urb *irq; |
37 | char phys[32]; | 38 | char phys[32]; |
38 | }; | 39 | }; |
@@ -53,10 +54,14 @@ static void kbtab_irq(struct urb *urb) | |||
53 | case -ENOENT: | 54 | case -ENOENT: |
54 | case -ESHUTDOWN: | 55 | case -ESHUTDOWN: |
55 | /* this urb is terminated, clean up */ | 56 | /* this urb is terminated, clean up */ |
56 | dbg("%s - urb shutting down with status: %d", __func__, urb->status); | 57 | dev_dbg(&kbtab->intf->dev, |
58 | "%s - urb shutting down with status: %d\n", | ||
59 | __func__, urb->status); | ||
57 | return; | 60 | return; |
58 | default: | 61 | default: |
59 | dbg("%s - nonzero urb status received: %d", __func__, urb->status); | 62 | dev_dbg(&kbtab->intf->dev, |
63 | "%s - nonzero urb status received: %d\n", | ||
64 | __func__, urb->status); | ||
60 | goto exit; | 65 | goto exit; |
61 | } | 66 | } |
62 | 67 | ||
@@ -80,8 +85,9 @@ static void kbtab_irq(struct urb *urb) | |||
80 | exit: | 85 | exit: |
81 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 86 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
82 | if (retval) | 87 | if (retval) |
83 | err("%s - usb_submit_urb failed with result %d", | 88 | dev_err(&kbtab->intf->dev, |
84 | __func__, retval); | 89 | "%s - usb_submit_urb failed with result %d\n", |
90 | __func__, retval); | ||
85 | } | 91 | } |
86 | 92 | ||
87 | static struct usb_device_id kbtab_ids[] = { | 93 | static struct usb_device_id kbtab_ids[] = { |
@@ -131,6 +137,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
131 | goto fail2; | 137 | goto fail2; |
132 | 138 | ||
133 | kbtab->usbdev = dev; | 139 | kbtab->usbdev = dev; |
140 | kbtab->intf = intf; | ||
134 | kbtab->dev = input_dev; | 141 | kbtab->dev = input_dev; |
135 | 142 | ||
136 | usb_make_path(dev, kbtab->phys, sizeof(kbtab->phys)); | 143 | usb_make_path(dev, kbtab->phys, sizeof(kbtab->phys)); |