USB: input: keyspan_remote.c: fix up dev_err() usage
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 May 2012 00:56:41 +0000 (20:56 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 May 2012 00:56:41 +0000 (20:56 -0400)
We should always reference the input device for dev_err(), not the USB
device.  Fix up the places where I got this wrong.

Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/input/misc/keyspan_remote.c

index 9a45c88bc65f48361ab6093d2857c5963a649c88..7f017d497d83be169f28df58cb6f4aa791723d4b 100644 (file)
@@ -267,7 +267,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
                                remote->data.tester = remote->data.tester >> 6;
                                remote->data.bits_left -= 6;
                        } else {
-                               dev_err(&remote->udev->dev,
+                               dev_err(&remote->input->dev,
                                        "%s - Unknown sequence found in system data.\n",
                                        __func__);
                                remote->stage = 0;
@@ -288,7 +288,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
                                remote->data.tester = remote->data.tester >> 6;
                                remote->data.bits_left -= 6;
                        } else {
-                               dev_err(&remote->udev->dev,
+                               dev_err(&remote->input->dev,
                                        "%s - Unknown sequence found in button data.\n",
                                        __func__);
                                remote->stage = 0;
@@ -306,7 +306,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
                        remote->data.tester = remote->data.tester >> 6;
                        remote->data.bits_left -= 6;
                } else {
-                       dev_err(&remote->udev->dev,
+                       dev_err(&remote->input->dev,
                                "%s - Error in message, invalid toggle.\n",
                                __func__);
                        remote->stage = 0;
@@ -318,7 +318,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
                        remote->data.tester = remote->data.tester >> 5;
                        remote->data.bits_left -= 5;
                } else {
-                       dev_err(&remote->udev->dev,
+                       dev_err(&remote->input->dev,
                                "Bad message received, no stop bit found.\n");
                }
 
@@ -404,7 +404,7 @@ static void keyspan_irq_recv(struct urb *urb)
 resubmit:
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval)
-               dev_err(&dev->udev->dev,
+               dev_err(&dev->input->dev,
                        "%s - usb_submit_urb failed with result: %d\n",
                        __func__, retval);
 }