UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Greg Kroah-Hartman 2012-05-01 20:56:46 -04:00
parent 6b37dbba5d
commit aa330384a6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/input/misc/yealink.c
View File

@ -428,7 +428,7 @@ static void urb_irq_callback(struct urb *urb)
int ret, status = urb->status; int ret, status = urb->status;
if (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); __func__, status);
switch (yld->irq_data->cmd) { switch (yld->irq_data->cmd) {
@ -444,7 +444,7 @@ static void urb_irq_callback(struct urb *urb)
break; break;
default: default:
dev_err(&yld->udev->dev, "unexpected response %x\n", dev_err(&yld->idev->dev, "unexpected response %x\n",
yld->irq_data->cmd); yld->irq_data->cmd);
} }
@ -453,7 +453,7 @@ static void urb_irq_callback(struct urb *urb)
if (!yld->shutdown) { if (!yld->shutdown) {
ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC); ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
if (ret && ret != -EPERM) if (ret && ret != -EPERM)
dev_err(&yld->udev->dev, dev_err(&yld->idev->dev,
"%s - usb_submit_urb failed %d\n", "%s - usb_submit_urb failed %d\n",
__func__, ret); __func__, ret);
} }
@ -465,7 +465,7 @@ static void urb_ctl_callback(struct urb *urb)
int ret = 0, status = urb->status; int ret = 0, status = urb->status;
if (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); __func__, status);
switch (yld->ctl_data->cmd) { switch (yld->ctl_data->cmd) {
@ -484,7 +484,7 @@ static void urb_ctl_callback(struct urb *urb)
} }
if (ret && ret != -EPERM) 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); __func__, ret);
} }