Commit f9e02329 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Benjamin Tissoires:

 - A couple of i2c-hid fixes (Kenny Levinsen & Nam Cao)

 - A config issue with mcp-2221 when CONFIG_IIO is not enabled
   (Abdelrahman Morsy)

 - A dev_err fix in intel-ish-hid (Zhang Lixu)

 - A couple of mouse fixes for both nintendo and Logitech-dj (Nuno
   Pereira and Yaraslau Furman)

 - I'm changing my main kernel email address as it's way simpler for me
   than the Red Hat one (Benjamin Tissoires)

* tag 'for-linus-2024042501' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: mcp-2221: cancel delayed_work only when CONFIG_IIO is enabled
  HID: logitech-dj: allow mice to use all types of reports
  HID: i2c-hid: Revert to await reset ACK before reading report descriptor
  HID: nintendo: Fix N64 controller being identified as mouse
  MAINTAINERS: update Benjamin's email address
  HID: intel-ish-hid: ipc: Fix dev_err usage with uninitialized dev->devc
  HID: i2c-hid: remove I2C_HID_READ_PENDING flag to prevent lock-up
parents e88c4cfc 3cba9cfc

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net> 
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>

Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -9576,7 +9576,7 @@ F: kernel/power/ 








HID CORE LAYER









M:	Jiri Kosina <jikos@kernel.org>









M:	Benjamin Tissoires <benjamin.tissoires@redhat.com>









M:	Benjamin Tissoires <bentiss@kernel.org>









L:	linux-input@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git








@@ -22839,7 +22839,7 @@ F:	drivers/usb/host/ehci*















USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)









M:	Jiri Kosina <jikos@kernel.org>









M:	Benjamin Tissoires <benjamin.tissoires@redhat.com>









M:	Benjamin Tissoires <bentiss@kernel.org>









L:	linux-usb@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git

























drivers/hid/hid-logitech-dj.c



+1
−3






























Original line number
Diff line number
Diff line







@@ -965,9 +965,7 @@ static void logi_hidpp_dev_conn_notif_equad(struct hid_device *hdev,







		}









		break;









	case REPORT_TYPE_MOUSE:









		workitem->reports_supported |= STD_MOUSE | HIDPP;









		if (djrcv_dev->type == recvr_type_mouse_only)









			workitem->reports_supported |= MULTIMEDIA;









		workitem->reports_supported |= STD_MOUSE | HIDPP | MULTIMEDIA;









		break;









	}









}
































drivers/hid/hid-mcp2221.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -944,9 +944,11 @@ static void mcp2221_hid_unregister(void *ptr)







/* This is needed to be sure hid_hw_stop() isn't called twice by the subsystem */









static void mcp2221_remove(struct hid_device *hdev)









{









#if IS_REACHABLE(CONFIG_IIO)









	struct mcp2221 *mcp = hid_get_drvdata(hdev);



















	cancel_delayed_work_sync(&mcp->init_work);









#endif









}



















#if IS_REACHABLE(CONFIG_IIO)
































drivers/hid/hid-nintendo.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -481,10 +481,10 @@ static const struct joycon_ctlr_button_mapping n64con_button_mappings[] = {







	{ BTN_TR,		JC_BTN_R,	},









	{ BTN_TR2,		JC_BTN_LSTICK,	}, /* ZR */









	{ BTN_START,		JC_BTN_PLUS,	},









	{ BTN_FORWARD,		JC_BTN_Y,	}, /* C UP */









	{ BTN_BACK,		JC_BTN_ZR,	}, /* C DOWN */









	{ BTN_LEFT,		JC_BTN_X,	}, /* C LEFT */









	{ BTN_RIGHT,		JC_BTN_MINUS,	}, /* C RIGHT */









	{ BTN_SELECT,		JC_BTN_Y,	}, /* C UP */









	{ BTN_X,		JC_BTN_ZR,	}, /* C DOWN */









	{ BTN_Y,		JC_BTN_X,	}, /* C LEFT */









	{ BTN_C,		JC_BTN_MINUS,	}, /* C RIGHT */









	{ BTN_MODE,		JC_BTN_HOME,	},









	{ BTN_Z,		JC_BTN_CAP,	},









	{ /* sentinel */ },