From 1134baf8a72d6f376fa877bbe257056fd496b669 Mon Sep 17 00:00:00 2001
From: Przemo Firszt <przemo@firszt.eu>
Date: Tue, 15 May 2012 19:32:26 +0100
Subject: [PATCH] --- yaml --- r: 305071 b: refs/heads/master c:
 be4925b018b3c398d2775826091c693f214630a8 h: refs/heads/master i:   305069:
 64f34ac571b222ee435931e33d1ff85fc76d079e   305067:
 cd7aab23ec8bf9b27ba9a5ae0ca6ac77b60b606c   305063:
 6791b71d41c764d34f7825490db9001894fd4ae5   305055:
 e185a18c913f624c418a291583ae9a7960b3f43f v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/hid/hid-wacom.c | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ce809b9a3ed0..b653e0aa2b8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 163a6ae19b8f6afc4ac4f60711b998a3c150b858
+refs/heads/master: be4925b018b3c398d2775826091c693f214630a8
diff --git a/trunk/drivers/hid/hid-wacom.c b/trunk/drivers/hid/hid-wacom.c
index 4fc4eebe9784..5f6ce70c23fb 100644
--- a/trunk/drivers/hid/hid-wacom.c
+++ b/trunk/drivers/hid/hid-wacom.c
@@ -228,16 +228,25 @@ static int wacom_ac_get_property(struct power_supply *psy,
 	return ret;
 }
 
-static void wacom_set_features(struct hid_device *hdev)
+static void wacom_set_features(struct hid_device *hdev, u8 speed)
 {
+	struct wacom_data *wdata = hid_get_drvdata(hdev);
 	int ret;
 	__u8 rep_data[2];
 
-	/*set high speed, tablet mode*/
+	if (speed == 1)
+		wdata->features &= ~0x20;
+	else
+		wdata->features |= 0x20;
+
 	rep_data[0] = 0x03;
-	rep_data[1] = 0x20;
+	rep_data[1] = wdata->features;
+
 	ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
 				HID_FEATURE_REPORT);
+	if (ret >= 0)
+		wdata->high_speed = speed;
+
 	return;
 }
 
@@ -719,7 +728,7 @@ static int wacom_probe(struct hid_device *hdev,
 	case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:
 		sprintf(hdev->name, "%s", "Wacom Intuos4 WL");
 		wdata->features = 0;
-		wacom_set_features(hdev);
+		wacom_set_features(hdev, 1);
 		ret = wacom_initialize_leds(hdev);
 		if (ret) {
 			hid_warn(hdev,