From 40021884a67a4dc23daeb6f4d68ce22758be10ab Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 25 Apr 2012 14:48:30 -0700
Subject: [PATCH] --- yaml --- r: 303615 b: refs/heads/master c:
 2385f3c3c757b6ffb766c320df4a7f7a45593f24 h: refs/heads/master i:   303613:
 b4f3aea13fc7a6705c44e4e0cada198493930ba9   303611:
 360ffaf5b5b5253b8ebb9d21d08412e73c01d103   303607:
 1ec1ffc48c5890c35757f15712047836cbd11862   303599:
 abc2c737f5d81ad420191109b681230f2c607d7a   303583:
 da5dd189af90a6fd8f96aba7b247eb7c7958aca7   303551:
 246d115c6b7059f7abeaabcfac649fd6fb7fe52c   303487:
 0e163904011df8c405b98a529463625c37084b67   303359:
 6b4391575ba57bbd47f7c1f3cfcc6de17fab7602   303103:
 9f474f7c6cfc3ab1a97e9cdc0b28bb05351a865d v: v3

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

diff --git a/[refs] b/[refs]
index c4c050e2727c..2acd74186426 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4efeca581bc84105c2e82d28a3a29e6cd9784204
+refs/heads/master: 2385f3c3c757b6ffb766c320df4a7f7a45593f24
diff --git a/trunk/drivers/input/misc/powermate.c b/trunk/drivers/input/misc/powermate.c
index 538f7049ec64..71ec621fbefa 100644
--- a/trunk/drivers/input/misc/powermate.c
+++ b/trunk/drivers/input/misc/powermate.c
@@ -110,8 +110,9 @@ static void powermate_irq(struct urb *urb)
 exit:
 	retval = usb_submit_urb (urb, GFP_ATOMIC);
 	if (retval)
-		err ("%s - usb_submit_urb failed with result %d",
-		     __func__, retval);
+		dev_err(&pm->udev->dev,
+			"%s - usb_submit_urb failed with result: %d\n",
+			__func__, retval);
 }
 
 /* Decide if we need to issue a control message and do so. Must be called with pm->lock taken */