]> Pileus Git - ~andy/linux/commitdiff
USB: input: powermate.c: fix up dev_* messages
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 May 2012 22:33:00 +0000 (15:33 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 May 2012 22:33:00 +0000 (15:33 -0700)
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>
drivers/input/misc/powermate.c

index d16717e8e9c4adffcffb2a9692e0068acbbf67ae..49c0c3ebd32141442acbc58deb9ef0b7e8f1b402 100644 (file)
@@ -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));