From 93d8a2f9ce199194643a6564fd7966e3fc678dce Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 1 May 2012 21:33:03 -0700
Subject: [PATCH] --- yaml --- r: 303686 b: refs/heads/master c:
 8b0725c0593871106d24ed94e7a14cf2316cb21d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 66388d8cb77e..4167960233de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4f0bbcd1d53dc40e2ac56f2ab116f9ba612a8ee
+refs/heads/master: 8b0725c0593871106d24ed94e7a14cf2316cb21d
diff --git a/trunk/drivers/input/misc/powermate.c b/trunk/drivers/input/misc/powermate.c
index 3091b82b1f97..d16717e8e9c4 100644
--- a/trunk/drivers/input/misc/powermate.c
+++ b/trunk/drivers/input/misc/powermate.c
@@ -85,6 +85,7 @@ static void powermate_config_complete(struct urb *urb);
 static void powermate_irq(struct urb *urb)
 {
 	struct powermate_device *pm = urb->context;
+	struct device *dev = &pm->input->dev;
 	int retval;
 
 	switch (urb->status) {
@@ -95,10 +96,12 @@ static void powermate_irq(struct urb *urb)
 	case -ENOENT:
 	case -ESHUTDOWN:
 		/* this urb is terminated, clean up */
-		dbg("%s - urb shutting down with status: %d", __func__, urb->status);
+		dev_dbg(dev, "%s - urb shutting down with status: %d\n",
+			__func__, urb->status);
 		return;
 	default:
-		dbg("%s - nonzero urb status received: %d", __func__, urb->status);
+		dev_dbg(dev, "%s - nonzero urb status received: %d\n",
+			__func__, urb->status);
 		goto exit;
 	}
 
@@ -110,8 +113,7 @@ static void powermate_irq(struct urb *urb)
 exit:
 	retval = usb_submit_urb (urb, GFP_ATOMIC);
 	if (retval)
-		dev_err(&pm->input->dev,
-			"%s - usb_submit_urb failed with result: %d\n",
+		dev_err(dev, "%s - usb_submit_urb failed with result: %d\n",
 			__func__, retval);
 }