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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

Pull HID fixes from Jiri Kosina:

- fix for one corner case in HID++ protocol with respect to handling
very long reports, from Hans de Goede

- power management fix in Intel-ISH driver, from Hyungwoo Yang

- use-after-free fix in Intel-ISH driver, from Dan Carpenter

- a couple of new device IDs/quirks from Kai-Heng Feng, Kyle Godbey and
Oleksandr Natalenko

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
HID: intel-ish-hid: fix wrong driver_data usage
HID: multitouch: Add pointstick support for ALPS Touchpad
HID: logitech-dj: Fix forwarding of very long HID++ reports
HID: uclogic: Add support for Huion HS64 tablet
HID: chicony: add another quirk for PixArt mouse
HID: intel-ish-hid: Fix a use after free in load_fw_from_host()

Linus Torvalds 763cf1f2 fe2da896

+33 -5
+3
drivers/hid/hid-ids.h
··· 80 80 #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220 81 81 #define HID_DEVICE_ID_ALPS_U1 0x1215 82 82 #define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C 83 + #define HID_DEVICE_ID_ALPS_1222 0x1222 83 84 84 85 85 86 #define USB_VENDOR_ID_AMI 0x046b ··· 270 269 #define USB_DEVICE_ID_CHICONY_MULTI_TOUCH 0xb19d 271 270 #define USB_DEVICE_ID_CHICONY_WIRELESS 0x0618 272 271 #define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE 0x1053 272 + #define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2 0x0939 273 273 #define USB_DEVICE_ID_CHICONY_WIRELESS2 0x1123 274 274 #define USB_DEVICE_ID_ASUS_AK1D 0x1125 275 275 #define USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A 0x1408 ··· 571 569 572 570 #define USB_VENDOR_ID_HUION 0x256c 573 571 #define USB_DEVICE_ID_HUION_TABLET 0x006e 572 + #define USB_DEVICE_ID_HUION_HS64 0x006d 574 573 575 574 #define USB_VENDOR_ID_IBM 0x04b3 576 575 #define USB_DEVICE_ID_IBM_SCROLLPOINT_III 0x3100
+3 -1
drivers/hid/hid-logitech-dj.c
··· 30 30 31 31 #define REPORT_ID_HIDPP_SHORT 0x10 32 32 #define REPORT_ID_HIDPP_LONG 0x11 33 + #define REPORT_ID_HIDPP_VERY_LONG 0x12 33 34 34 35 #define HIDPP_REPORT_SHORT_LENGTH 7 35 36 #define HIDPP_REPORT_LONG_LENGTH 20 ··· 1243 1242 int ret; 1244 1243 1245 1244 if ((buf[0] == REPORT_ID_HIDPP_SHORT) || 1246 - (buf[0] == REPORT_ID_HIDPP_LONG)) { 1245 + (buf[0] == REPORT_ID_HIDPP_LONG) || 1246 + (buf[0] == REPORT_ID_HIDPP_VERY_LONG)) { 1247 1247 if (count < 2) 1248 1248 return -EINVAL; 1249 1249
+4
drivers/hid/hid-multitouch.c
··· 1776 1776 HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, 1777 1777 USB_VENDOR_ID_ALPS_JP, 1778 1778 HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) }, 1779 + { .driver_data = MT_CLS_WIN_8_DUAL, 1780 + HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, 1781 + USB_VENDOR_ID_ALPS_JP, 1782 + HID_DEVICE_ID_ALPS_1222) }, 1779 1783 1780 1784 /* Lenovo X1 TAB Gen 2 */ 1781 1785 { .driver_data = MT_CLS_WIN_8_DUAL,
+1
drivers/hid/hid-quirks.c
··· 42 42 { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM), HID_QUIRK_NOGET }, 43 43 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, 44 44 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, 45 + { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, 45 46 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS), HID_QUIRK_MULTI_INPUT }, 46 47 { HID_USB_DEVICE(USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD), HID_QUIRK_BADPAD }, 47 48 { HID_USB_DEVICE(USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK), HID_QUIRK_NOGET },
+2
drivers/hid/hid-uclogic-core.c
··· 369 369 USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) }, 370 370 { HID_USB_DEVICE(USB_VENDOR_ID_HUION, 371 371 USB_DEVICE_ID_HUION_TABLET) }, 372 + { HID_USB_DEVICE(USB_VENDOR_ID_HUION, 373 + USB_DEVICE_ID_HUION_HS64) }, 372 374 { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, 373 375 USB_DEVICE_ID_HUION_TABLET) }, 374 376 { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,
+2
drivers/hid/hid-uclogic-params.c
··· 977 977 /* FALL THROUGH */ 978 978 case VID_PID(USB_VENDOR_ID_HUION, 979 979 USB_DEVICE_ID_HUION_TABLET): 980 + case VID_PID(USB_VENDOR_ID_HUION, 981 + USB_DEVICE_ID_HUION_HS64): 980 982 case VID_PID(USB_VENDOR_ID_UCLOGIC, 981 983 USB_DEVICE_ID_HUION_TABLET): 982 984 case VID_PID(USB_VENDOR_ID_UCLOGIC,
+1 -1
drivers/hid/intel-ish-hid/ishtp-fw-loader.c
··· 816 816 goto end_err_fw_release; 817 817 818 818 release_firmware(fw); 819 - kfree(filename); 820 819 dev_info(cl_data_to_dev(client_data), "ISH firmware %s loaded\n", 821 820 filename); 821 + kfree(filename); 822 822 return 0; 823 823 824 824 end_err_fw_release:
+2 -2
drivers/hid/intel-ish-hid/ishtp-hid-client.c
··· 891 891 */ 892 892 static int hid_ishtp_cl_suspend(struct device *device) 893 893 { 894 - struct ishtp_cl_device *cl_device = dev_get_drvdata(device); 894 + struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device); 895 895 struct ishtp_cl *hid_ishtp_cl = ishtp_get_drvdata(cl_device); 896 896 struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl); 897 897 ··· 912 912 */ 913 913 static int hid_ishtp_cl_resume(struct device *device) 914 914 { 915 - struct ishtp_cl_device *cl_device = dev_get_drvdata(device); 915 + struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device); 916 916 struct ishtp_cl *hid_ishtp_cl = ishtp_get_drvdata(cl_device); 917 917 struct ishtp_cl_data *client_data = ishtp_get_client_data(hid_ishtp_cl); 918 918
+14 -1
drivers/hid/intel-ish-hid/ishtp/bus.c
··· 471 471 } 472 472 473 473 ishtp_device_ready = true; 474 - dev_set_drvdata(&device->dev, device); 475 474 476 475 return device; 477 476 } ··· 637 638 return cl_device->driver_data; 638 639 } 639 640 EXPORT_SYMBOL(ishtp_get_drvdata); 641 + 642 + /** 643 + * ishtp_dev_to_cl_device() - get ishtp_cl_device instance from device instance 644 + * @device: device instance 645 + * 646 + * Get ish_cl_device instance which embeds device instance in it. 647 + * 648 + * Return: pointer to ishtp_cl_device instance 649 + */ 650 + struct ishtp_cl_device *ishtp_dev_to_cl_device(struct device *device) 651 + { 652 + return to_ishtp_cl_device(device); 653 + } 654 + EXPORT_SYMBOL(ishtp_dev_to_cl_device); 640 655 641 656 /** 642 657 * ishtp_bus_new_client() - Create a new client
+1
include/linux/intel-ish-client-if.h
··· 103 103 void ishtp_get_device(struct ishtp_cl_device *cl_dev); 104 104 void ishtp_set_drvdata(struct ishtp_cl_device *cl_device, void *data); 105 105 void *ishtp_get_drvdata(struct ishtp_cl_device *cl_device); 106 + struct ishtp_cl_device *ishtp_dev_to_cl_device(struct device *dev); 106 107 int ishtp_register_event_cb(struct ishtp_cl_device *device, 107 108 void (*read_cb)(struct ishtp_cl_device *)); 108 109 struct ishtp_fw_client *ishtp_fw_cl_get_client(struct ishtp_device *dev,