diff options
| author |   Yufeng Shen <miletus@chromium.org> | 2012-06-22 12:31:53 -0400 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2012-06-25 15:30:15 +0200 |
| commit | e75561b3d2a4eb15080ed73f59f7dc2965c01423 (patch) | |
| tree | 01507c7e31e8874a25fbe37283f27b0fb792db35 | |
| parent | HID: logitech: don't use stack based dj_report structures (diff) | |
| download | linux-dev-e75561b3d2a4eb15080ed73f59f7dc2965c01423.tar.xz linux-dev-e75561b3d2a4eb15080ed73f59f7dc2965c01423.zip | |
HID: magicmouse: Correct report range of major / minor axes
In patch "HID: magicmouse: Adjust major / minor axes to scale",
touch_major and touch_minor axes are scaled by a factor of
four when reported but the max touch_major/minor is not scaled
accordingly. This patch scales the max touch_major/minor to
be consistent with the reported value.
Signed-off-by: Yufeng Shen <miletus@chromium.org>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 7cf3ffe4b7bc..40ac6654f1d1 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -426,8 +426,10 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h __set_bit(EV_ABS, input->evbit); input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0); - input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0); - input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0); + input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255 << 2, + 4, 0); + input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255 << 2, + 4, 0); input_set_abs_params(input, ABS_MT_ORIENTATION, -31, 32, 1, 0); /* Note: Touch Y position from the device is inverted relative |