From 4c52df2ca38a8352c5f3ec3a9845baddca4afeb2 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 20 Apr 2012 16:53:42 -0700
Subject: [PATCH] --- yaml --- r: 303575 b: refs/heads/master c:
 ef1ffb7296a19958b7575b382b7b0343bd441646 h: refs/heads/master i:   303573:
 60c363b30b85bb209b49b971c4085be72cd65751   303571:
 13d5a76d3f031dcc50a8e4b6f704689e2278282a   303567:
 3b16208bd1fd1085e31ad71f7bce0b154139abc1 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/misc/idmouse.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 019d4573186b..a38eb31e076a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9a527dae346c0ad56410c3794ba5ec535c66bcc
+refs/heads/master: ef1ffb7296a19958b7575b382b7b0343bd441646
diff --git a/trunk/drivers/usb/misc/idmouse.c b/trunk/drivers/usb/misc/idmouse.c
index 0dee24698504..c00fcd74d39d 100644
--- a/trunk/drivers/usb/misc/idmouse.c
+++ b/trunk/drivers/usb/misc/idmouse.c
@@ -366,14 +366,14 @@ static int idmouse_probe(struct usb_interface *interface,
 			kmalloc(IMGSIZE + dev->bulk_in_size, GFP_KERNEL);
 
 		if (!dev->bulk_in_buffer) {
-			err("Unable to allocate input buffer.");
+			dev_err(&interface->dev, "Unable to allocate input buffer.\n");
 			idmouse_delete(dev);
 			return -ENOMEM;
 		}
 	}
 
 	if (!(dev->bulk_in_endpointAddr)) {
-		err("Unable to find bulk-in endpoint.");
+		dev_err(&interface->dev, "Unable to find bulk-in endpoint.\n");
 		idmouse_delete(dev);
 		return -ENODEV;
 	}
@@ -385,7 +385,7 @@ static int idmouse_probe(struct usb_interface *interface,
 	result = usb_register_dev(interface, &idmouse_class);
 	if (result) {
 		/* something prevented us from registering this device */
-		err("Unble to allocate minor number.");
+		dev_err(&interface->dev, "Unble to allocate minor number.\n");
 		usb_set_intfdata(interface, NULL);
 		idmouse_delete(dev);
 		return result;