mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 03:40:04 +00:00
Merge branch 'for-4.12/upstream-fixes' into for-linus
This commit is contained in:
commit
900a88ef34
3 changed files with 11 additions and 8 deletions
|
@ -319,6 +319,9 @@
|
||||||
#define USB_VENDOR_ID_DELCOM 0x0fc5
|
#define USB_VENDOR_ID_DELCOM 0x0fc5
|
||||||
#define USB_DEVICE_ID_DELCOM_VISUAL_IND 0xb080
|
#define USB_DEVICE_ID_DELCOM_VISUAL_IND 0xb080
|
||||||
|
|
||||||
|
#define USB_VENDOR_ID_DELL 0x413c
|
||||||
|
#define USB_DEVICE_ID_DELL_PIXART_USB_OPTICAL_MOUSE 0x301a
|
||||||
|
|
||||||
#define USB_VENDOR_ID_DELORME 0x1163
|
#define USB_VENDOR_ID_DELORME 0x1163
|
||||||
#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
|
#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
|
||||||
#define USB_DEVICE_ID_DELORME_EM_LT20 0x0200
|
#define USB_DEVICE_ID_DELORME_EM_LT20 0x0200
|
||||||
|
|
|
@ -349,7 +349,6 @@ static int magicmouse_raw_event(struct hid_device *hdev,
|
||||||
|
|
||||||
if (input->id.product == USB_DEVICE_ID_APPLE_MAGICMOUSE) {
|
if (input->id.product == USB_DEVICE_ID_APPLE_MAGICMOUSE) {
|
||||||
magicmouse_emit_buttons(msc, clicks & 3);
|
magicmouse_emit_buttons(msc, clicks & 3);
|
||||||
input_mt_report_pointer_emulation(input, true);
|
|
||||||
input_report_rel(input, REL_X, x);
|
input_report_rel(input, REL_X, x);
|
||||||
input_report_rel(input, REL_Y, y);
|
input_report_rel(input, REL_Y, y);
|
||||||
} else { /* USB_DEVICE_ID_APPLE_MAGICTRACKPAD */
|
} else { /* USB_DEVICE_ID_APPLE_MAGICTRACKPAD */
|
||||||
|
@ -389,16 +388,16 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd
|
||||||
__clear_bit(BTN_RIGHT, input->keybit);
|
__clear_bit(BTN_RIGHT, input->keybit);
|
||||||
__clear_bit(BTN_MIDDLE, input->keybit);
|
__clear_bit(BTN_MIDDLE, input->keybit);
|
||||||
__set_bit(BTN_MOUSE, 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(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);
|
__set_bit(EV_ABS, input->evbit);
|
||||||
|
|
||||||
|
|
|
@ -85,6 +85,7 @@ static const struct hid_blacklist {
|
||||||
{ USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K65RGB_RAPIDFIRE, HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL },
|
{ USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K65RGB_RAPIDFIRE, HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL },
|
||||||
{ USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_SCIMITAR_PRO_RGB, HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL },
|
{ USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_SCIMITAR_PRO_RGB, HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL },
|
||||||
{ USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51, HID_QUIRK_NOGET },
|
{ USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51, HID_QUIRK_NOGET },
|
||||||
|
{ USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
|
||||||
{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
|
{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
|
||||||
{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
|
{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
|
||||||
{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3, HID_QUIRK_MULTI_INPUT },
|
{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3, HID_QUIRK_MULTI_INPUT },
|
||||||
|
|
Loading…
Reference in a new issue