summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:56:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:56:41 -0400
commit3b449fe5d5585a43f26bda4c3d86b7677d4c80db (patch)
treec0924af2e70c318b3bb23a20c2ccc7cb0ebb77aa /drivers/input
parent388fd2026633acf2a23fcb7918ba24d9d646bcfb (diff)
downloadlinux-stable-3b449fe5d5585a43f26bda4c3d86b7677d4c80db.tar.gz
linux-stable-3b449fe5d5585a43f26bda4c3d86b7677d4c80db.tar.bz2
linux-stable-3b449fe5d5585a43f26bda4c3d86b7677d4c80db.zip
USB: input: keyspan_remote.c: fix up dev_err() usage
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>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/keyspan_remote.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c
index 9a45c88bc65f..7f017d497d83 100644
--- a/drivers/input/misc/keyspan_remote.c
+++ b/drivers/input/misc/keyspan_remote.c
@@ -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);
}