summaryrefslogtreecommitdiff
path: root/drivers/input/misc/yealink.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-02 04:56:46 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-02 04:56:46 +0400
commitaa330384a6444682126de5dd49982fa428badd08 (patch)
treefd294a4843e90bd768bd43db32707d0096d909ec /drivers/input/misc/yealink.c
parent6b37dbba5d5f4e167eb5ca57e43c1bd49a696831 (diff)
downloadlinux-aa330384a6444682126de5dd49982fa428badd08.tar.xz
USB: input: yealink.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: Henk Vergonet <Henk.Vergonet@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/misc/yealink.c')
-rw-r--r--drivers/input/misc/yealink.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index 4984823b3681..9f71bb174eed 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -428,7 +428,7 @@ static void urb_irq_callback(struct urb *urb)
int ret, status = urb->status;
if (status)
- dev_err(&yld->udev->dev, "%s - urb status %d\n",
+ dev_err(&yld->idev->dev, "%s - urb status %d\n",
__func__, status);
switch (yld->irq_data->cmd) {
@@ -444,7 +444,7 @@ static void urb_irq_callback(struct urb *urb)
break;
default:
- dev_err(&yld->udev->dev, "unexpected response %x\n",
+ dev_err(&yld->idev->dev, "unexpected response %x\n",
yld->irq_data->cmd);
}
@@ -453,7 +453,7 @@ static void urb_irq_callback(struct urb *urb)
if (!yld->shutdown) {
ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
if (ret && ret != -EPERM)
- dev_err(&yld->udev->dev,
+ dev_err(&yld->idev->dev,
"%s - usb_submit_urb failed %d\n",
__func__, ret);
}
@@ -465,7 +465,7 @@ static void urb_ctl_callback(struct urb *urb)
int ret = 0, status = urb->status;
if (status)
- dev_err(&yld->udev->dev, "%s - urb status %d\n",
+ dev_err(&yld->idev->dev, "%s - urb status %d\n",
__func__, status);
switch (yld->ctl_data->cmd) {
@@ -484,7 +484,7 @@ static void urb_ctl_callback(struct urb *urb)
}
if (ret && ret != -EPERM)
- dev_err(&yld->udev->dev, "%s - usb_submit_urb failed %d\n",
+ dev_err(&yld->idev->dev, "%s - usb_submit_urb failed %d\n",
__func__, ret);
}