aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:56:38 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:56:38 -0400
commit388fd2026633acf2a23fcb7918ba24d9d646bcfb (patch)
tree534c34f5ca7520088cefc4bfd510e50465702833 /drivers/input/misc
parent39e85a2673c0c9696939dbe10e79c2fb4b91b91c (diff)
USB: input: cm109.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> CC: Axel Lin <axel.lin@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/cm109.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index 412fe5719cb6..9e76ab18e944 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -327,7 +327,7 @@ static void cm109_submit_buzz_toggle(struct cm109_dev *dev)
327 327
328 error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC); 328 error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC);
329 if (error) 329 if (error)
330 dev_err(&dev->intf->dev, 330 dev_err(&dev->idev->dev,
331 "%s: usb_submit_urb (urb_ctl) failed %d\n", 331 "%s: usb_submit_urb (urb_ctl) failed %d\n",
332 __func__, error); 332 __func__, error);
333} 333}
@@ -351,7 +351,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
351 if (status) { 351 if (status) {
352 if (status == -ESHUTDOWN) 352 if (status == -ESHUTDOWN)
353 return; 353 return;
354 dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status); 354 dev_err(&dev->idev->dev, "%s: urb status %d\n", __func__, status);
355 } 355 }
356 356
357 /* Special keys */ 357 /* Special keys */
@@ -398,7 +398,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
398 398
399 error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC); 399 error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC);
400 if (error) 400 if (error)
401 dev_err(&dev->intf->dev, 401 dev_err(&dev->idev->dev,
402 "%s: usb_submit_urb (urb_ctl) failed %d\n", 402 "%s: usb_submit_urb (urb_ctl) failed %d\n",
403 __func__, error); 403 __func__, error);
404 } 404 }
@@ -419,7 +419,7 @@ static void cm109_urb_ctl_callback(struct urb *urb)
419 dev->ctl_data->byte[3]); 419 dev->ctl_data->byte[3]);
420 420
421 if (status) 421 if (status)
422 dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status); 422 dev_err(&dev->idev->dev, "%s: urb status %d\n", __func__, status);
423 423
424 spin_lock(&dev->ctl_submit_lock); 424 spin_lock(&dev->ctl_submit_lock);
425 425
@@ -436,7 +436,7 @@ static void cm109_urb_ctl_callback(struct urb *urb)
436 dev->irq_urb_pending = 1; 436 dev->irq_urb_pending = 1;
437 error = usb_submit_urb(dev->urb_irq, GFP_ATOMIC); 437 error = usb_submit_urb(dev->urb_irq, GFP_ATOMIC);
438 if (error) 438 if (error)
439 dev_err(&dev->intf->dev, 439 dev_err(&dev->idev->dev,
440 "%s: usb_submit_urb (urb_irq) failed %d\n", 440 "%s: usb_submit_urb (urb_irq) failed %d\n",
441 __func__, error); 441 __func__, error);
442 } 442 }
@@ -480,7 +480,7 @@ static void cm109_toggle_buzzer_sync(struct cm109_dev *dev, int on)
480 dev->ctl_data, 480 dev->ctl_data,
481 USB_PKT_LEN, USB_CTRL_SET_TIMEOUT); 481 USB_PKT_LEN, USB_CTRL_SET_TIMEOUT);
482 if (error < 0 && error != -EINTR) 482 if (error < 0 && error != -EINTR)
483 dev_err(&dev->intf->dev, "%s: usb_control_msg() failed %d\n", 483 dev_err(&dev->idev->dev, "%s: usb_control_msg() failed %d\n",
484 __func__, error); 484 __func__, error);
485} 485}
486 486