diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-04 15:33:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-04 15:33:00 -0700 |
| commit | c25e647836cd53f2da7ceff6fabf2603b4362212 (patch) | |
| tree | 2f154a375852aa0a12ee5d649d73b3a852ed9190 /drivers/input | |
| parent | 419b1a11fbe7889f8c3e62b0ef33e8b393279563 (diff) | |
| download | linux-3.10-c25e647836cd53f2da7ceff6fabf2603b4362212.tar.gz linux-3.10-c25e647836cd53f2da7ceff6fabf2603b4362212.tar.bz2 linux-3.10-c25e647836cd53f2da7ceff6fabf2603b4362212.zip | |
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')
| -rw-r--r-- | drivers/input/misc/powermate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c index d16717e8e9c..49c0c3ebd32 100644 --- a/drivers/input/misc/powermate.c +++ b/drivers/input/misc/powermate.c @@ -65,6 +65,7 @@ struct powermate_device { struct urb *irq, *config; struct usb_ctrlrequest *configcr; struct usb_device *udev; + struct usb_interface *intf; struct input_dev *input; spinlock_t lock; int static_brightness; @@ -85,7 +86,7 @@ static void powermate_config_complete(struct urb *urb); static void powermate_irq(struct urb *urb) { struct powermate_device *pm = urb->context; - struct device *dev = &pm->input->dev; + struct device *dev = &pm->intf->dev; int retval; switch (urb->status) { @@ -333,6 +334,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i goto fail3; pm->udev = udev; + pm->intf = intf; pm->input = input_dev; usb_make_path(udev, pm->phys, sizeof(pm->phys)); |