aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
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/misc
parent388fd2026633acf2a23fcb7918ba24d9d646bcfb (diff)
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/misc')
-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)
267 remote->data.tester = remote->data.tester >> 6; 267 remote->data.tester = remote->data.tester >> 6;
268 remote->data.bits_left -= 6; 268 remote->data.bits_left -= 6;
269 } else { 269 } else {
270 dev_err(&remote->udev->dev, 270 dev_err(&remote->input->dev,
271 "%s - Unknown sequence found in system data.\n", 271 "%s - Unknown sequence found in system data.\n",
272 __func__); 272 __func__);
273 remote->stage = 0; 273 remote->stage = 0;
@@ -288,7 +288,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
288 remote->data.tester = remote->data.tester >> 6; 288 remote->data.tester = remote->data.tester >> 6;
289 remote->data.bits_left -= 6; 289 remote->data.bits_left -= 6;
290 } else { 290 } else {
291 dev_err(&remote->udev->dev, 291 dev_err(&remote->input->dev,
292 "%s - Unknown sequence found in button data.\n", 292 "%s - Unknown sequence found in button data.\n",
293 __func__); 293 __func__);
294 remote->stage = 0; 294 remote->stage = 0;
@@ -306,7 +306,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
306 remote->data.tester = remote->data.tester >> 6; 306 remote->data.tester = remote->data.tester >> 6;
307 remote->data.bits_left -= 6; 307 remote->data.bits_left -= 6;
308 } else { 308 } else {
309 dev_err(&remote->udev->dev, 309 dev_err(&remote->input->dev,
310 "%s - Error in message, invalid toggle.\n", 310 "%s - Error in message, invalid toggle.\n",
311 __func__); 311 __func__);
312 remote->stage = 0; 312 remote->stage = 0;
@@ -318,7 +318,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
318 remote->data.tester = remote->data.tester >> 5; 318 remote->data.tester = remote->data.tester >> 5;
319 remote->data.bits_left -= 5; 319 remote->data.bits_left -= 5;
320 } else { 320 } else {
321 dev_err(&remote->udev->dev, 321 dev_err(&remote->input->dev,
322 "Bad message received, no stop bit found.\n"); 322 "Bad message received, no stop bit found.\n");
323 } 323 }
324 324
@@ -404,7 +404,7 @@ static void keyspan_irq_recv(struct urb *urb)
404resubmit: 404resubmit:
405 retval = usb_submit_urb(urb, GFP_ATOMIC); 405 retval = usb_submit_urb(urb, GFP_ATOMIC);
406 if (retval) 406 if (retval)
407 dev_err(&dev->udev->dev, 407 dev_err(&dev->input->dev,
408 "%s - usb_submit_urb failed with result: %d\n", 408 "%s - usb_submit_urb failed with result: %d\n",
409 __func__, retval); 409 __func__, retval);
410} 410}