From b0c8c9fc104824748f9ef26e418cbf0fb01a6136 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 1 May 2012 20:56:34 -0400
Subject: [PATCH] --- yaml --- r: 303669 b: refs/heads/master c:
 39e85a2673c0c9696939dbe10e79c2fb4b91b91c h: refs/heads/master i:   303667:
 628264b9960d071bbfae8a4d6c3186470974d3ab v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/input/joystick/xpad.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 768919654722..7915279d8127 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d331efdd993f4c392f5f63f970b3a55996e3a959
+refs/heads/master: 39e85a2673c0c9696939dbe10e79c2fb4b91b91c
diff --git a/trunk/drivers/input/joystick/xpad.c b/trunk/drivers/input/joystick/xpad.c
index bee9c00032ee..d760031430a3 100644
--- a/trunk/drivers/input/joystick/xpad.c
+++ b/trunk/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);
 }