From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 2 May 2012 00:56:46 +0000 (-0400)
Subject: USB: input: yealink.c: fix up dev_err() usage
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aa330384a6444682126de5dd49982fa428badd08;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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);
 }