aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2010-09-10 16:03:45 +0200
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 08:46:56 -0600
commit53072d368cb8bf5cc15ac90c792278bfecd7302c (patch)
tree77317eac9ab8ead955b8b2093a153a5830381100 /drivers
parent4bad8c5fe15173afdc3d214edbdda8f42e3357cc (diff)
UBUNTU: SAUCE: hid: ntrig: Correct logic for quirks
The driver data is a bitmask, check for correct bits. Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and Lenovo T410s. Not likely to go upstream in its present form. However, it does help constitue a tuning-free driver which works well together with Unity, and as such are vital to the MT push. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/hid-ntrig.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index e23ba2845af..3eafe29ce0c 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -866,7 +866,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
struct input_dev *input;
struct hid_report *report;
- if (id->driver_data)
+ if (id->driver_data & NTRIG_DUPLICATE_USAGES)
hdev->quirks |= HID_QUIRK_MULTI_INPUT
| HID_QUIRK_NO_INIT_REPORTS;