From 8f6a5d8e2d970e97059995092ccf72227ffa67bb Mon Sep 17 00:00:00 2001
From: Przemo Firszt <przemo@firszt.eu>
Date: Wed, 14 Mar 2012 19:55:03 +0000
Subject: [PATCH] --- yaml --- r: 291651 b: refs/heads/master c:
 9a911da8d792a2d8f9a1e07eb1c41e0d7f4ec307 h: refs/heads/master i:   291649:
 ee27a9406e0be48cbe6017da05569fc4edb582a2   291647:
 5b6ef36364c73d1a3d140425554bc3290e03518d v: v3

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

diff --git a/[refs] b/[refs]
index dcac5476dec8..277cb8cb301d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 693f45bb2d6ff5bf8fb3b69ff904b44ef8cffd8d
+refs/heads/master: 9a911da8d792a2d8f9a1e07eb1c41e0d7f4ec307
diff --git a/trunk/drivers/hid/hid-wacom.c b/trunk/drivers/hid/hid-wacom.c
index f9af474275db..3fc93869024e 100644
--- a/trunk/drivers/hid/hid-wacom.c
+++ b/trunk/drivers/hid/hid-wacom.c
@@ -492,9 +492,7 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi,
 	__set_bit(BTN_MIDDLE, input->keybit);
 
 	/* Pad */
-	input->evbit[0] |= BIT(EV_MSC);
-
-	__set_bit(MSC_SERIAL, input->mscbit);
+	input_set_capability(input, EV_MSC, MSC_SERIAL);
 
 	__set_bit(BTN_0, input->keybit);
 	__set_bit(BTN_1, input->keybit);