Merge branches 'upstream' and 'upstream-fixes' into for-linus

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;
 }