aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-04 18:33:00 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-04 18:33:00 -0400
commitc25e647836cd53f2da7ceff6fabf2603b4362212 (patch)
tree2f154a375852aa0a12ee5d649d73b3a852ed9190 /drivers/input/misc
parent419b1a11fbe7889f8c3e62b0ef33e8b393279563 (diff)
USB: input: powermate.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/misc')
-rw-r--r--drivers/input/misc/powermate.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c
index d16717e8e9c4..49c0c3ebd321 100644
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -65,6 +65,7 @@ struct powermate_device {
65 struct urb *irq, *config; 65 struct urb *irq, *config;
66 struct usb_ctrlrequest *configcr; 66 struct usb_ctrlrequest *configcr;
67 struct usb_device *udev; 67 struct usb_device *udev;
68 struct usb_interface *intf;
68 struct input_dev *input; 69 struct input_dev *input;
69 spinlock_t lock; 70 spinlock_t lock;
70 int static_brightness; 71 int static_brightness;
@@ -85,7 +86,7 @@ static void powermate_config_complete(struct urb *urb);
85static void powermate_irq(struct urb *urb) 86static void powermate_irq(struct urb *urb)
86{ 87{
87 struct powermate_device *pm = urb->context; 88 struct powermate_device *pm = urb->context;
88 struct device *dev = &pm->input->dev; 89 struct device *dev = &pm->intf->dev;
89 int retval; 90 int retval;
90 91
91 switch (urb->status) { 92 switch (urb->status) {
@@ -333,6 +334,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
333 goto fail3; 334 goto fail3;
334 335
335 pm->udev = udev; 336 pm->udev = udev;
337 pm->intf = intf;
336 pm->input = input_dev; 338 pm->input = input_dev;
337 339
338 usb_make_path(udev, pm->phys, sizeof(pm->phys)); 340 usb_make_path(udev, pm->phys, sizeof(pm->phys));