summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-04 15:33:11 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-04 15:33:11 -0700
commited2b2f2db2d52098bdda3877367d59984febdd9f (patch)
tree662cc19543a59cafd203f9223f96653b9fd9d395 /drivers/input
parent27c2597d455a24507f1d0be6991a0a84b5c1b035 (diff)
USB: input: kbtab.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/kbtab.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c
index a39d1761a6cb..3fba74b9b602 100644
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@ -33,6 +33,7 @@ struct kbtab {
dma_addr_t data_dma;
struct input_dev *dev;
struct usb_device *usbdev;
+ struct usb_interface *intf;
struct urb *irq;
char phys[32];
};
@@ -53,11 +54,13 @@ static void kbtab_irq(struct urb *urb)
case -ENOENT:
case -ESHUTDOWN:
/* this urb is terminated, clean up */
- dev_dbg(&dev->dev, "%s - urb shutting down with status: %d\n",
+ dev_dbg(&kbtab->intf->dev,
+ "%s - urb shutting down with status: %d\n",
__func__, urb->status);
return;
default:
- dev_dbg(&dev->dev, "%s - nonzero urb status received: %d\n",
+ dev_dbg(&kbtab->intf->dev,
+ "%s - nonzero urb status received: %d\n",
__func__, urb->status);
goto exit;
}
@@ -82,7 +85,7 @@ static void kbtab_irq(struct urb *urb)
exit:
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
- dev_err(&dev->dev,
+ dev_err(&kbtab->intf->dev,
"%s - usb_submit_urb failed with result %d\n",
__func__, retval);
}
@@ -134,6 +137,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
goto fail2;
kbtab->usbdev = dev;
+ kbtab->intf = intf;
kbtab->dev = input_dev;
usb_make_path(dev, kbtab->phys, sizeof(kbtab->phys));