summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:56:34 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-01 20:56:34 -0400
commit39e85a2673c0c9696939dbe10e79c2fb4b91b91c (patch)
tree4e9b0134c586ac2d46c7b44014ece0d075c6cbd6
parentd331efdd993f4c392f5f63f970b3a55996e3a959 (diff)
downloadlwn-39e85a2673c0c9696939dbe10e79c2fb4b91b91c.tar.gz
lwn-39e85a2673c0c9696939dbe10e79c2fb4b91b91c.zip
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>
-rw-r--r--drivers/input/joystick/xpad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index bee9c00032ee..d760031430a3 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);
}