1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index f0fbd7bd239e..2ab71758e2e2 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -405,6 +405,13 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
                         __set_bit(REL_HWHEEL, input->relbit);
                 }
         } else { /* USB_DEVICE_ID_APPLE_MAGICTRACKPAD */
+                /* input->keybit is initialized with incorrect button info
+                 * for Magic Trackpad. There really is only one physical
+                 * button (BTN_LEFT == BTN_MOUSE). Make sure we don't
+                 * advertise buttons that don't exist...
+                 */
+                __clear_bit(BTN_RIGHT, input->keybit);
+                __clear_bit(BTN_MIDDLE, input->keybit);
                 __set_bit(BTN_MOUSE, input->keybit);
                 __set_bit(BTN_TOOL_FINGER, input->keybit);
                 __set_bit(BTN_TOOL_DOUBLETAP, input->keybit);