diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-01-08 03:08:19 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-01-08 03:08:19 +0300 |
| commit | a7153258b70ccbe3922fcee9ca4271d4f4c2bc55 (patch) | |
| tree | 12e17027af36846933908da64a1419491ea58676 /drivers/hid/hid-magicmouse.c | |
| parent | ae5e49c79c051ea1d5ca91cbd4a0d22189067ba3 (diff) | |
| parent | 0fbf8ed976af5bb43cf9cf2492161eb9688fee0c (diff) | |
| download | linux-a7153258b70ccbe3922fcee9ca4271d4f4c2bc55.tar.xz | |
Merge branches 'upstream' and 'upstream-fixes' into for-linus
Diffstat (limited to 'drivers/hid/hid-magicmouse.c')
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 11306b3d9c56..698e6459fd0b 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -435,6 +435,11 @@ static int magicmouse_input_mapping(struct hid_device *hdev, if (!msc->input) msc->input = hi->input; + /* Magic Trackpad does not give relative data after switching to MT */ + if (hi->input->id.product == USB_DEVICE_ID_APPLE_MAGICTRACKPAD && + field->flags & HID_MAIN_ITEM_RELATIVE) + return -1; + return 0; } |