From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 2 May 2012 00:57:11 +0000 (-0400)
Subject: USB: input: usbtouchscreen.c: fix up dev_err() usage
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f864b60ad0078b74c765f00f0600588b85c0a239;p=~shefty%2Frdma-dev.git

USB: input: usbtouchscreen.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: Henrik Rydberg <rydberg@euromail.se>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Viresh Kumar <viresh.kumar@st.com>
CC: Armando Visconti <armando.visconti@st.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 955441cb030..4127cf7bb25 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -1380,7 +1380,7 @@ exit:
 	usb_mark_last_busy(interface_to_usbdev(usbtouch->interface));
 	retval = usb_submit_urb(urb, GFP_ATOMIC);
 	if (retval)
-		dev_err(&usbtouch->interface->dev,
+		dev_err(&usbtouch->input->dev,
 			"%s - usb_submit_urb failed with result: %d\n",
 			__func__, retval);
 }
@@ -1623,7 +1623,7 @@ static int usbtouch_probe(struct usb_interface *intf,
 		err = usb_submit_urb(usbtouch->irq, GFP_KERNEL);
 		if (err) {
 			usb_autopm_put_interface(intf);
-			dev_err(&intf->dev,
+			dev_err(&input_dev->dev,
 				"%s - usb_submit_urb failed with result: %d\n",
 				__func__, err);
 			goto out_unregister_input;