Skip to content

Commit

Permalink
USB: input: keyspan_remote.c: fix up dev_err() usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed May 2, 2012
1 parent 388fd20 commit 3b449fe
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/input/misc/keyspan_remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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");
}

Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 3b449fe

Please sign in to comment.