diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-01 20:56:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-01 20:56:38 -0400 |
| commit | 388fd2026633acf2a23fcb7918ba24d9d646bcfb (patch) | |
| tree | 534c34f5ca7520088cefc4bfd510e50465702833 /drivers | |
| parent | 39e85a2673c0c9696939dbe10e79c2fb4b91b91c (diff) | |
| download | linux-388fd2026633acf2a23fcb7918ba24d9d646bcfb.tar.gz | |
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')
| -rw-r--r-- | drivers/input/misc/cm109.c | 12 |
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) error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC); if (error) - dev_err(&dev->intf->dev, + dev_err(&dev->idev->dev, "%s: usb_submit_urb (urb_ctl) failed %d\n", __func__, error); } @@ -351,7 +351,7 @@ static void cm109_urb_irq_callback(struct urb *urb) if (status) { if (status == -ESHUTDOWN) return; - dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status); + dev_err(&dev->idev->dev, "%s: urb status %d\n", __func__, status); } /* Special keys */ @@ -398,7 +398,7 @@ static void cm109_urb_irq_callback(struct urb *urb) error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC); if (error) - dev_err(&dev->intf->dev, + dev_err(&dev->idev->dev, "%s: usb_submit_urb (urb_ctl) failed %d\n", __func__, error); } @@ -419,7 +419,7 @@ static void cm109_urb_ctl_callback(struct urb *urb) dev->ctl_data->byte[3]); if (status) - dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status); + dev_err(&dev->idev->dev, "%s: urb status %d\n", __func__, status); spin_lock(&dev->ctl_submit_lock); @@ -436,7 +436,7 @@ static void cm109_urb_ctl_callback(struct urb *urb) dev->irq_urb_pending = 1; error = usb_submit_urb(dev->urb_irq, GFP_ATOMIC); if (error) - dev_err(&dev->intf->dev, + dev_err(&dev->idev->dev, "%s: usb_submit_urb (urb_irq) failed %d\n", __func__, error); } @@ -480,7 +480,7 @@ static void cm109_toggle_buzzer_sync(struct cm109_dev *dev, int on) dev->ctl_data, USB_PKT_LEN, USB_CTRL_SET_TIMEOUT); if (error < 0 && error != -EINTR) - dev_err(&dev->intf->dev, "%s: usb_control_msg() failed %d\n", + dev_err(&dev->idev->dev, "%s: usb_control_msg() failed %d\n", __func__, error); } |