tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'upstream-fixes' into for-next

Conflicts:

drivers/hid/hid-ids.h

Jiri Kosina ed42350e 1db489b2

+10 -2
unified split
+1
drivers/hid/hid-core.c
··· 1498 { HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109) }, 1499 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM) }, 1500 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE) }, 1501 { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) }, 1502 { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, 1503 { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
··· 1498 { HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109) }, 1499 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM) }, 1500 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE) }, 1501 + { HID_USB_DEVICE(USB_VENDOR_ID_DEALEXTREAME, USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701) }, 1502 { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) }, 1503 { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, 1504 { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
+6
drivers/hid/hid-ids.h
··· 138 #define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61 139 #define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64 140 141 #define USB_VENDOR_ID_DELORME 0x1163 142 #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100 143 #define USB_DEVICE_ID_DELORME_EM_LT20 0x0200 ··· 383 384 #define USB_VENDOR_ID_TURBOX 0x062a 385 #define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201 386 387 #define USB_VENDOR_ID_VERNIER 0x08f7 388 #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001
··· 138 #define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61 139 #define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64 140 141 + #define USB_VENDOR_ID_DEALEXTREAME 0x10c5 142 + #define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701 0x819a 143 + 144 #define USB_VENDOR_ID_DELORME 0x1163 145 #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100 146 #define USB_DEVICE_ID_DELORME_EM_LT20 0x0200 ··· 380 381 #define USB_VENDOR_ID_TURBOX 0x062a 382 #define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201 383 + 384 + #define USB_VENDOR_ID_UCLOGIC 0x5543 385 + #define USB_DEVICE_ID_UCLOGIC_TABLET_PF1209 0x0042 386 387 #define USB_VENDOR_ID_VERNIER 0x08f7 388 #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001
+1 -1
drivers/hid/hid-sony.c
··· 102 } 103 104 ret = sony_set_operational(hdev); 105 - if (ret) 106 goto err_stop; 107 108 return 0;
··· 102 } 103 104 ret = sony_set_operational(hdev); 105 + if (ret < 0) 106 goto err_stop; 107 108 return 0;
+1 -1
drivers/hid/hidraw.c
··· 208 209 list_del(&list->node); 210 dev = hidraw_table[minor]; 211 - if (!dev->open--) { 212 if (list->hidraw->exist) 213 dev->hid->ll_driver->close(dev->hid); 214 else
··· 208 209 list_del(&list->node); 210 dev = hidraw_table[minor]; 211 + if (!--dev->open) { 212 if (list->hidraw->exist) 213 dev->hid->ll_driver->close(dev->hid); 214 else
+1
drivers/hid/usbhid/hid-quirks.c
··· 54 { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, 55 { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, 56 { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET }, 57 { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS }, 58 { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, 59
··· 54 { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, 55 { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, 56 { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET }, 57 + { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209, HID_QUIRK_MULTI_INPUT }, 58 { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS }, 59 { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, 60