diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:35:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:35:30 -0400 |
| commit | 7fd23a24717a327a66f3c32d11a20a2f169c824f (patch) | |
| tree | 62a731f3edac9e58427fc27396ad5da8804fa579 /drivers/hid/hid-magicmouse.c | |
| parent | 0a95d92c0054e74fb79607ac2df958b7bf295706 (diff) | |
| parent | 65b06194c9c9f41bc07ac6a6d42edb4b9e43fea4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits)
HID: add support for Logitech Driving Force Pro wheel
HID: hid-ortek: remove spurious reference
HID: add support for Ortek PKB-1700
HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor'
HID: hid-ntrig: init settle and mode check
HID: merge hid-egalax into hid-multitouch
HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing
HID: ntrig remove if and drop an indent
HID: ACRUX - activate the device immediately after binding
HID: ntrig: apply NO_INIT_REPORTS quirk
HID: hid-magicmouse: Correct touch orientation direction
HID: ntrig don't dereference unclaimed hidinput
HID: Do not create input devices for feature reports
HID: bt hidp: send Output reports using SET_REPORT on the Control channel
HID: hid-sony.c: Fix sending Output reports to the Sixaxis
HID: add support for Keytouch IEC 60945
HID: Add HID Report Descriptor to sysfs
HID: add IRTOUCH infrared USB to hid_have_special_driver
HID: kernel oops in out_cleanup in function hidinput_connect
HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)
...
Diffstat (limited to 'drivers/hid/hid-magicmouse.c')
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 698e6459fd0b..318cc40df92d 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c | |||
| @@ -258,7 +258,7 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda | |||
| 258 | input_report_abs(input, ABS_MT_TRACKING_ID, id); | 258 | input_report_abs(input, ABS_MT_TRACKING_ID, id); |
| 259 | input_report_abs(input, ABS_MT_TOUCH_MAJOR, touch_major << 2); | 259 | input_report_abs(input, ABS_MT_TOUCH_MAJOR, touch_major << 2); |
| 260 | input_report_abs(input, ABS_MT_TOUCH_MINOR, touch_minor << 2); | 260 | input_report_abs(input, ABS_MT_TOUCH_MINOR, touch_minor << 2); |
| 261 | input_report_abs(input, ABS_MT_ORIENTATION, orientation); | 261 | input_report_abs(input, ABS_MT_ORIENTATION, -orientation); |
| 262 | input_report_abs(input, ABS_MT_POSITION_X, x); | 262 | input_report_abs(input, ABS_MT_POSITION_X, x); |
| 263 | input_report_abs(input, ABS_MT_POSITION_Y, y); | 263 | input_report_abs(input, ABS_MT_POSITION_Y, y); |
| 264 | 264 | ||
| @@ -397,7 +397,7 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h | |||
| 397 | input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0); | 397 | input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0); |
| 398 | input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0); | 398 | input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0); |
| 399 | input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0); | 399 | input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0); |
| 400 | input_set_abs_params(input, ABS_MT_ORIENTATION, -32, 31, 1, 0); | 400 | input_set_abs_params(input, ABS_MT_ORIENTATION, -31, 32, 1, 0); |
| 401 | 401 | ||
| 402 | /* Note: Touch Y position from the device is inverted relative | 402 | /* Note: Touch Y position from the device is inverted relative |
| 403 | * to how pointer motion is reported (and relative to how USB | 403 | * to how pointer motion is reported (and relative to how USB |