aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/hid-magicmouse.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index e6dc15171664..ed732b746c96 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -433,6 +433,11 @@ static int magicmouse_input_mapping(struct hid_device *hdev,
433 if (!msc->input) 433 if (!msc->input)
434 msc->input = hi->input; 434 msc->input = hi->input;
435 435
436 /* Magic Trackpad does not give relative data after switching to MT */
437 if (hi->input->id.product == USB_DEVICE_ID_APPLE_MAGICTRACKPAD &&
438 field->flags & HID_MAIN_ITEM_RELATIVE)
439 return -1;
440
436 return 0; 441 return 0;
437} 442}
438 443