Commit 60541fb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Jiri Kosina:

 - linked list race condition fix in hid-steam driver from Rodrigo Rivas
   Costa

 - assorted deviceID-specific quirks and other small cosmetic cleanups

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: logitech-hidpp: avoid repeated "multiplier = " log messages
  HID: logitech: Use HIDPP_RECEIVER_INDEX instead of 0xff
  HID: quirks: Ignore Simply Automated UPB PIM
  HID: apple: Disable Fn-key key-re-mapping on clone keyboards
  MAINTAINERS: update uhid and hid-wiimote entry
  HID: steam: fixes race in handling device list.
  HID: magicmouse: do not set up autorepeat
  HID: alps: support devices with report id 2
  HID: quirks: Always poll Obins Anne Pro 2 keyboard
  HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor override
parents a238ac2d e13762ab

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -17514,7 +17514,7 @@ F: Documentation/admin-guide/ufs.rst 
F:	fs/ufs/















UHID USERSPACE HID IO DRIVER













M:	David Herrmann <dh.herrmann@googlemail.com>













M:	David Rheinsberg <david.rheinsberg@gmail.com>















L:	linux-input@vger.kernel.org















S:	Maintained















F:	drivers/hid/uhid.c










@@ -18473,7 +18473,7 @@ S:	Maintained













F:	drivers/rtc/rtc-sd3078.c





























WIIMOTE HID DRIVER













M:	David Herrmann <dh.herrmann@googlemail.com>













M:	David Rheinsberg <david.rheinsberg@gmail.com>















L:	linux-input@vger.kernel.org















S:	Maintained















F:	drivers/hid/hid-wiimote*

























drivers/hid/hid-alps.c



+2
−0






























Original line number
Diff line number
Diff line








@@ -25,6 +25,7 @@





























#define U1_MOUSE_REPORT_ID			0x01 /* Mouse data ReportID */















#define U1_ABSOLUTE_REPORT_ID		0x03 /* Absolute data ReportID */













#define U1_ABSOLUTE_REPORT_ID_SECD  0x02 /* FW-PTP Absolute data ReportID */















#define U1_FEATURE_REPORT_ID		0x05 /* Feature ReportID */















#define U1_SP_ABSOLUTE_REPORT_ID	0x06 /* Feature ReportID */


























@@ -368,6 +369,7 @@ static int u1_raw_event(struct alps_dev *hdata, u8 *data, int size)













	case U1_FEATURE_REPORT_ID:















		break;















	case U1_ABSOLUTE_REPORT_ID:













	case U1_ABSOLUTE_REPORT_ID_SECD:















		for (i = 0; i < hdata->max_fingers; i++) {















			u8 *contact = &data[i * 5];

















































drivers/hid/hid-apple.c



+18
−0






























Original line number
Diff line number
Diff line








@@ -60,6 +60,7 @@ MODULE_PARM_DESC(swap_fn_leftctrl, "Swap the Fn and left Control keys. "













struct apple_sc {















	unsigned long quirks;















	unsigned int fn_on;













	unsigned int fn_found;















	DECLARE_BITMAP(pressed_numlock, KEY_CNT);















};


























@@ -365,12 +366,15 @@ static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi,













		struct hid_field *field, struct hid_usage *usage,















		unsigned long **bit, int *max)















{













	struct apple_sc *asc = hid_get_drvdata(hdev);





























	if (usage->hid == (HID_UP_CUSTOM | 0x0003) ||















			usage->hid == (HID_UP_MSVENDOR | 0x0003) ||















			usage->hid == (HID_UP_HPVENDOR2 | 0x0003)) {















		/* The fn key on Apple USB keyboards */















		set_bit(EV_REP, hi->input->evbit);















		hid_map_usage_clear(hi, usage, bit, max, EV_KEY, KEY_FN);













		asc->fn_found = true;















		apple_setup_input(hi->input);















		return 1;















	}









@@ -397,6 +401,19 @@ static int apple_input_mapped(struct hid_device *hdev, struct hid_input *hi,













	return 0;















}





























static int apple_input_configured(struct hid_device *hdev,













		struct hid_input *hidinput)













{













	struct apple_sc *asc = hid_get_drvdata(hdev);



























	if ((asc->quirks & APPLE_HAS_FN) && !asc->fn_found) {













		hid_info(hdev, "Fn key not found (Apple Wireless Keyboard clone?), disabling Fn key handling\n");













		asc->quirks = 0;













	}



























	return 0;













}





























static int apple_probe(struct hid_device *hdev,















		const struct hid_device_id *id)















{










@@ -611,6 +628,7 @@ static struct hid_driver apple_driver = {













	.event = apple_event,















	.input_mapping = apple_input_mapping,















	.input_mapped = apple_input_mapped,













	.input_configured = apple_input_configured,















};















module_hid_driver(apple_driver);

















































drivers/hid/hid-ids.h



+3
−0






























Original line number
Diff line number
Diff line








@@ -618,6 +618,7 @@













#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081	0xa081















#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A0C2	0xa0c2















#define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD_A096	0xa096













#define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD_A293	0xa293































#define USB_VENDOR_ID_IMATION		0x0718















#define USB_DEVICE_ID_DISC_STAKKA	0xd000










@@ -998,6 +999,8 @@













#define USB_DEVICE_ID_ROCCAT_RYOS_MK_PRO	0x3232















#define USB_DEVICE_ID_ROCCAT_SAVU	0x2d5a





























#define USB_VENDOR_ID_SAI		0x17dd





























#define USB_VENDOR_ID_SAITEK		0x06a3















#define USB_DEVICE_ID_SAITEK_RUMBLEPAD	0xff17















#define USB_DEVICE_ID_SAITEK_PS1000	0x0621

































drivers/hid/hid-logitech-dj.c



+3
−3






























Original line number
Diff line number
Diff line








@@ -1153,7 +1153,7 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)













	if (!dj_report)















		return -ENOMEM;















	dj_report->report_id = REPORT_ID_DJ_SHORT;













	dj_report->device_index = 0xFF;













	dj_report->device_index = HIDPP_RECEIVER_INDEX;















	dj_report->report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;















	retval = logi_dj_recv_send_report(djrcv_dev, dj_report);















	kfree(dj_report);









@@ -1175,7 +1175,7 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,





























	if (djrcv_dev->type == recvr_type_dj) {















		dj_report->report_id = REPORT_ID_DJ_SHORT;













		dj_report->device_index = 0xFF;













		dj_report->device_index = HIDPP_RECEIVER_INDEX;















		dj_report->report_type = REPORT_TYPE_CMD_SWITCH;















		dj_report->report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;















		dj_report->report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] =










@@ -1204,7 +1204,7 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,













	memset(buf, 0, HIDPP_REPORT_SHORT_LENGTH);































	buf[0] = REPORT_ID_HIDPP_SHORT;













	buf[1] = 0xFF;













	buf[1] = HIDPP_RECEIVER_INDEX;















	buf[2] = 0x80;















	buf[3] = 0x00;















	buf[4] = 0x00;









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE