Skip to content

Commit

Permalink
USB: input: yealink.c: fix up dev_err() usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed May 2, 2012
1 parent 6b37dbb commit aa33038
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/input/misc/yealink.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}

Expand All @@ -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);
}
Expand All @@ -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) {
Expand All @@ -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);
}

Expand Down

0 comments on commit aa33038

Please sign in to comment.