Commit 3f1d0865 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'input-for-v6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:

 - a new ID for ASUS ROG RAIKIRI controllers added to xpad driver

 - amimouse driver structure annotated with __refdata to prevent section
   mismatch warnings.

* tag 'input-for-v6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: amimouse - mark driver struct with __refdata to prevent section mismatch
  Input: xpad - add support for ASUS ROG RAIKIRI
parents 2c17a1cd 0537c8ee

drivers/input/joystick/xpad.c

+2 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ static const struct xpad_device { 
	{ 0x0738, 0xcb29, "Saitek Aviator Stick AV8R02", 0, XTYPE_XBOX360 },

	{ 0x0738, 0xf738, "Super SFIV FightStick TE S", 0, XTYPE_XBOX360 },

	{ 0x07ff, 0xffff, "Mad Catz GamePad", 0, XTYPE_XBOX360 },

	{ 0x0b05, 0x1a38, "ASUS ROG RAIKIRI", 0, XTYPE_XBOXONE },

	{ 0x0c12, 0x0005, "Intec wireless", 0, XTYPE_XBOX },

	{ 0x0c12, 0x8801, "Nyko Xbox Controller", 0, XTYPE_XBOX },

	{ 0x0c12, 0x8802, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
@@ -487,6 +488,7 @@ static const struct usb_device_id xpad_table[] = { 
	{ USB_DEVICE(0x0738, 0x4540) },		/* Mad Catz Beat Pad */

	XPAD_XBOXONE_VENDOR(0x0738),		/* Mad Catz FightStick TE 2 */

	XPAD_XBOX360_VENDOR(0x07ff),		/* Mad Catz Gamepad */

	XPAD_XBOXONE_VENDOR(0x0b05),		/* ASUS controllers */

	XPAD_XBOX360_VENDOR(0x0c12),		/* Zeroplus X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f Xbox 360 controllers */

	XPAD_XBOXONE_VENDOR(0x0e6f),		/* 0x0e6f Xbox One controllers */

drivers/input/mouse/amimouse.c

+7 −1
Original line number Diff line number Diff line
@@ -132,7 +132,13 @@ static void __exit amimouse_remove(struct platform_device *pdev) 
	input_unregister_device(dev);

}



static struct platform_driver amimouse_driver = {

/*

 * amimouse_remove() lives in .exit.text. For drivers registered via

 * module_platform_driver_probe() this is ok because they cannot get unbound at

 * runtime. So mark the driver struct with __refdata to prevent modpost

 * triggering a section mismatch warning.

 */

static struct platform_driver amimouse_driver __refdata = {

	.remove_new = __exit_p(amimouse_remove),

	.driver   = {

		.name	= "amiga-mouse",