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

---
 [refs]                                    |  2 +-
 trunk/drivers/input/misc/keyspan_remote.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0a630cd791e6..f252d4a6b9eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 388fd2026633acf2a23fcb7918ba24d9d646bcfb
+refs/heads/master: 3b449fe5d5585a43f26bda4c3d86b7677d4c80db
diff --git a/trunk/drivers/input/misc/keyspan_remote.c b/trunk/drivers/input/misc/keyspan_remote.c
index 9a45c88bc65f..7f017d497d83 100644
--- a/trunk/drivers/input/misc/keyspan_remote.c
+++ b/trunk/drivers/input/misc/keyspan_remote.c
@@ -267,7 +267,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
 				remote->data.tester = remote->data.tester >> 6;
 				remote->data.bits_left -= 6;
 			} else {
-				dev_err(&remote->udev->dev,
+				dev_err(&remote->input->dev,
 					"%s - Unknown sequence found in system data.\n",
 					__func__);
 				remote->stage = 0;
@@ -288,7 +288,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
 				remote->data.tester = remote->data.tester >> 6;
 				remote->data.bits_left -= 6;
 			} else {
-				dev_err(&remote->udev->dev,
+				dev_err(&remote->input->dev,
 					"%s - Unknown sequence found in button data.\n",
 					__func__);
 				remote->stage = 0;
@@ -306,7 +306,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
 			remote->data.tester = remote->data.tester >> 6;
 			remote->data.bits_left -= 6;
 		} else {
-			dev_err(&remote->udev->dev,
+			dev_err(&remote->input->dev,
 				"%s - Error in message, invalid toggle.\n",
 				__func__);
 			remote->stage = 0;
@@ -318,7 +318,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
 			remote->data.tester = remote->data.tester >> 5;
 			remote->data.bits_left -= 5;
 		} else {
-			dev_err(&remote->udev->dev,
+			dev_err(&remote->input->dev,
 				"Bad message received, no stop bit found.\n");
 		}
 
@@ -404,7 +404,7 @@ static void keyspan_irq_recv(struct urb *urb)
 resubmit:
 	retval = usb_submit_urb(urb, GFP_ATOMIC);
 	if (retval)
-		dev_err(&dev->udev->dev,
+		dev_err(&dev->input->dev,
 			"%s - usb_submit_urb failed with result: %d\n",
 			__func__, retval);
 }