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

USB: input: xpad.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: "Magnus Hörlin" <magnus@alefors.se>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index bee9c00032e..d760031430a 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -492,7 +492,7 @@ static void xpad_irq_in(struct urb *urb)
 exit:
 	retval = usb_submit_urb(urb, GFP_ATOMIC);
 	if (retval)
-		dev_err(&xpad->udev->dev,
+		dev_err(&xpad->dev->dev,
 			"%s - usb_submit_urb failed with result %d\n",
 			__func__, retval);
 }
@@ -542,7 +542,7 @@ static void xpad_irq_out(struct urb *urb)
 exit:
 	retval = usb_submit_urb(urb, GFP_ATOMIC);
 	if (retval)
-		dev_err(&xpad->udev->dev,
+		dev_err(&xpad->dev->dev,
 			"%s - usb_submit_urb failed with result %d\n",
 			__func__, retval);
 }