summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2013-03-22 18:38:34 +0100
committerJiri Kosina <jkosina@suse.cz>2013-03-27 14:02:47 +0100
commitfb4d8d98dc24f66f7f98e6506fad63e1c320cd82 (patch)
treeda259a586a8c46f72dc9626a46e4cc7bfb87f314 /drivers/hid
parentHID: multitouch: append " Pen" to the name of the stylus input (diff)
downloadlinux-fb4d8d98dc24f66f7f98e6506fad63e1c320cd82.tar.xz
linux-fb4d8d98dc24f66f7f98e6506fad63e1c320cd82.zip
HID: multitouch: force BTN_STYLUS for pen devices
The "tablet" udev rule relies on BTN_STYLUS to be set. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-multitouch.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 55551746d235..aceaf6c08878 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -418,6 +418,9 @@ static void mt_pen_input_configured(struct hid_device *hdev,
mt_free_input_name(hi);
hi->input->name = name;
}
+
+ /* force BTN_STYLUS to allow tablet matching in udev */
+ __set_bit(BTN_STYLUS, hi->input->keybit);
}
static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,