From: Andrew de los Reyes Date: Tue, 29 Jan 2013 21:45:16 +0000 (-0800) Subject: Revert "HID: magicmouse: Set multi-touch keybits for Magic Mouse" X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a690c857f29879849609df1d8ab8e0781733192d;p=people%2Faperard%2Flinux-chromebook.git Revert "HID: magicmouse: Set multi-touch keybits for Magic Mouse" The issue is this causes Chrome, I think, to consider this device a touchpad, but since we're using the mouse stack (for the time being) it breaks scroll. BUG=chromium-os:38330 TEST=manually tested that Magic Mouse works as expected This reverts commit 5c1386506de5237373db16f470d54e8a83afe318. Signed-off-by: Andrew de los Reyes Change-Id: I56f420039252a9c0b4283f5aa9ad68655c305576 Reviewed-on: https://gerrit.chromium.org/gerrit/42252 Reviewed-by: Benson Leung --- diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 7aa5c7f0b9da9..73647266daadc 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -379,16 +379,16 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd __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); + __set_bit(BTN_TOOL_TRIPLETAP, input->keybit); + __set_bit(BTN_TOOL_QUADTAP, input->keybit); + __set_bit(BTN_TOOL_QUINTTAP, input->keybit); + __set_bit(BTN_TOUCH, input->keybit); + __set_bit(INPUT_PROP_POINTER, input->propbit); __set_bit(INPUT_PROP_BUTTONPAD, input->propbit); } - __set_bit(BTN_TOOL_FINGER, input->keybit); - __set_bit(BTN_TOOL_DOUBLETAP, input->keybit); - __set_bit(BTN_TOOL_TRIPLETAP, input->keybit); - __set_bit(BTN_TOOL_QUADTAP, input->keybit); - __set_bit(BTN_TOOL_QUINTTAP, input->keybit); - __set_bit(BTN_TOUCH, input->keybit); - __set_bit(INPUT_PROP_POINTER, input->propbit); __set_bit(EV_ABS, input->evbit);