aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-04 18:33:04 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-04 18:33:04 -0400
commit334698d435b4446d796a2059284256b9d28a0d19 (patch)
tree177cb19e26364bab114df81744d82b9ab7f0a59a /drivers/input
parentab943ca8942c50b7c35c561103efb4622c5bfb85 (diff)
USB: input: acecad.c: fix up dev_* messages
Previously I had made the struct device point to the input device, but after talking with Dmitry, he said that the USB device would make more sense for this driver to point to. So converted it to use that instead. CC: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/tablet/acecad.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c
index baa9d4ad0d00..e062ec899ca1 100644
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@ -51,6 +51,7 @@ struct usb_acecad {
51 char name[128]; 51 char name[128];
52 char phys[64]; 52 char phys[64];
53 struct usb_device *usbdev; 53 struct usb_device *usbdev;
54 struct usb_interface *intf;
54 struct input_dev *input; 55 struct input_dev *input;
55 struct urb *irq; 56 struct urb *irq;
56 57
@@ -63,6 +64,7 @@ static void usb_acecad_irq(struct urb *urb)
63 struct usb_acecad *acecad = urb->context; 64 struct usb_acecad *acecad = urb->context;
64 unsigned char *data = acecad->data; 65 unsigned char *data = acecad->data;
65 struct input_dev *dev = acecad->input; 66 struct input_dev *dev = acecad->input;
67 struct usb_interface *intf = acecad->intf;
66 int prox, status; 68 int prox, status;
67 69
68 switch (urb->status) { 70 switch (urb->status) {
@@ -73,11 +75,11 @@ static void usb_acecad_irq(struct urb *urb)
73 case -ENOENT: 75 case -ENOENT:
74 case -ESHUTDOWN: 76 case -ESHUTDOWN:
75 /* this urb is terminated, clean up */ 77 /* this urb is terminated, clean up */
76 dev_dbg(&dev->dev, "%s - urb shutting down with status: %d\n", 78 dev_dbg(&intf->dev, "%s - urb shutting down with status: %d\n",
77 __func__, urb->status); 79 __func__, urb->status);
78 return; 80 return;
79 default: 81 default:
80 dev_dbg(&dev->dev, "%s - nonzero urb status received: %d\n", 82 dev_dbg(&intf->dev, "%s - nonzero urb status received: %d\n",
81 __func__, urb->status); 83 __func__, urb->status);
82 goto resubmit; 84 goto resubmit;
83 } 85 }
@@ -107,7 +109,7 @@ static void usb_acecad_irq(struct urb *urb)
107resubmit: 109resubmit:
108 status = usb_submit_urb(urb, GFP_ATOMIC); 110 status = usb_submit_urb(urb, GFP_ATOMIC);
109 if (status) 111 if (status)
110 dev_err(&dev->dev, 112 dev_err(&intf->dev,
111 "can't resubmit intr, %s-%s/input0, status %d\n", 113 "can't resubmit intr, %s-%s/input0, status %d\n",
112 acecad->usbdev->bus->bus_name, 114 acecad->usbdev->bus->bus_name,
113 acecad->usbdev->devpath, status); 115 acecad->usbdev->devpath, status);
@@ -172,6 +174,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
172 } 174 }
173 175
174 acecad->usbdev = dev; 176 acecad->usbdev = dev;
177 acecad->intf = intf;
175 acecad->input = input_dev; 178 acecad->input = input_dev;
176 179
177 if (dev->manufacturer) 180 if (dev->manufacturer)