Skip to content

Commit 3f1d086

Browse files
committed
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
2 parents 2c17a1c + 0537c8e commit 3f1d086

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

drivers/input/joystick/xpad.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ static const struct xpad_device {
208208
{ 0x0738, 0xcb29, "Saitek Aviator Stick AV8R02", 0, XTYPE_XBOX360 },
209209
{ 0x0738, 0xf738, "Super SFIV FightStick TE S", 0, XTYPE_XBOX360 },
210210
{ 0x07ff, 0xffff, "Mad Catz GamePad", 0, XTYPE_XBOX360 },
211+
{ 0x0b05, 0x1a38, "ASUS ROG RAIKIRI", 0, XTYPE_XBOXONE },
211212
{ 0x0c12, 0x0005, "Intec wireless", 0, XTYPE_XBOX },
212213
{ 0x0c12, 0x8801, "Nyko Xbox Controller", 0, XTYPE_XBOX },
213214
{ 0x0c12, 0x8802, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
@@ -487,6 +488,7 @@ static const struct usb_device_id xpad_table[] = {
487488
{ USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */
488489
XPAD_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */
489490
XPAD_XBOX360_VENDOR(0x07ff), /* Mad Catz Gamepad */
491+
XPAD_XBOXONE_VENDOR(0x0b05), /* ASUS controllers */
490492
XPAD_XBOX360_VENDOR(0x0c12), /* Zeroplus X-Box 360 controllers */
491493
XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f Xbox 360 controllers */
492494
XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f Xbox One controllers */

drivers/input/mouse/amimouse.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,13 @@ static void __exit amimouse_remove(struct platform_device *pdev)
132132
input_unregister_device(dev);
133133
}
134134

135-
static struct platform_driver amimouse_driver = {
135+
/*
136+
* amimouse_remove() lives in .exit.text. For drivers registered via
137+
* module_platform_driver_probe() this is ok because they cannot get unbound at
138+
* runtime. So mark the driver struct with __refdata to prevent modpost
139+
* triggering a section mismatch warning.
140+
*/
141+
static struct platform_driver amimouse_driver __refdata = {
136142
.remove_new = __exit_p(amimouse_remove),
137143
.driver = {
138144
.name = "amiga-mouse",

0 commit comments

Comments
 (0)