From 7a3f2a0030b991dc28125a31f89098cc96103783 Mon Sep 17 00:00:00 2001
From: Stefan Achatz <erazor_de@users.sourceforge.net>
Date: Sun, 20 May 2012 22:45:08 +0200
Subject: [PATCH] --- yaml --- r: 316047 b: refs/heads/master c:
 4ec141ad4e470485803a98ddb250aa7df030e8df h: refs/heads/master i:   316045:
 a3b5642294f9dd12da3f03819baaac9784f12374   316043:
 ad1bf8842c661d6aa3c38d35f602daae8381fba7   316039:
 dc3e0fd0b85897a0133b5a975b6086d1cb761a41   316031:
 27ec30ca3d22afd25cfd433e115a64d83da91f71 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/hid/hid-roccat-kone.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3d228bf87628..c6a2287cd741 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4728f2dc9f8e32ce898223fb863316ed7fa2d224
+refs/heads/master: 4ec141ad4e470485803a98ddb250aa7df030e8df
diff --git a/trunk/drivers/hid/hid-roccat-kone.c b/trunk/drivers/hid/hid-roccat-kone.c
index 40090d602158..9ce2d0b615a4 100644
--- a/trunk/drivers/hid/hid-roccat-kone.c
+++ b/trunk/drivers/hid/hid-roccat-kone.c
@@ -138,7 +138,7 @@ static int kone_check_write(struct usb_device *usb_dev)
 		return 0;
 
 	/* unknown answer */
-	hid_err(usb_dev, "got retval %d when checking write\n", data);
+	dev_err(&usb_dev->dev, "got retval %d when checking write\n", data);
 	return -EIO;
 }
 
@@ -503,7 +503,7 @@ static ssize_t kone_sysfs_set_tcu(struct device *dev,
 
 		retval = kone_set_settings(usb_dev, &kone->settings);
 		if (retval) {
-			hid_err(usb_dev, "couldn't set tcu state\n");
+			dev_err(&usb_dev->dev, "couldn't set tcu state\n");
 			/*
 			 * try to reread valid settings into buffer overwriting
 			 * first error code
@@ -519,7 +519,7 @@ static ssize_t kone_sysfs_set_tcu(struct device *dev,
 
 	retval = size;
 exit_no_settings:
-	hid_err(usb_dev, "couldn't read settings\n");
+	dev_err(&usb_dev->dev, "couldn't read settings\n");
 exit_unlock:
 	mutex_unlock(&kone->kone_lock);
 	return retval;