[PATCH v2 2/4] Input: xpad - fix One S pad disconnecting when not opened
From: Cameron Gutman <hidden>
Date: 2016-08-16 04:10:20
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
The Xbox One S controller will hang after ~2 seconds of input if it isn't being read by the OS. After another ~5 seconds the controller will reset itself and reconnect to the host. To avoid this, we'll just read Xbox One controllers all the time, like we do for Xbox 360 wireless adapters. Signed-off-by: Cameron Gutman <redacted> --- drivers/input/joystick/xpad.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 19886db..3577253 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c@@ -1381,7 +1381,7 @@ static int xpad_init_input(struct usb_xpad *xpad) input_set_drvdata(input_dev, xpad); - if (xpad->xtype != XTYPE_XBOX360W) { + if (xpad->xtype != XTYPE_XBOX360W && xpad->xtype != XTYPE_XBOXONE) { input_dev->open = xpad_open; input_dev->close = xpad_close; }
@@ -1573,9 +1573,21 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id error = xpad_init_input(xpad); if (error) goto err_deinit_output; + + /* + * Newer Xbox One controllers will hang and disconnect if + * not initialized and read from when receiving user input. + */ + if (xpad->xtype == XTYPE_XBOXONE) { + error = xpad_start_input(xpad); + if (error) + goto err_deinit_input; + } } return 0; +err_deinit_input: + xpad_deinit_input(xpad); err_deinit_output: xpad_deinit_output(xpad); err_free_in_urb:
@@ -1593,6 +1605,8 @@ static void xpad_disconnect(struct usb_interface *intf) if (xpad->xtype == XTYPE_XBOX360W) xpad360w_stop_input(xpad); + else if (xpad->xtype == XTYPE_XBOXONE) + xpad_stop_input(xpad); xpad_deinit_input(xpad);
@@ -1636,7 +1650,7 @@ static int xpad_suspend(struct usb_interface *intf, pm_message_t message) xpad360w_poweroff_controller(xpad); } else { mutex_lock(&input->mutex); - if (input->users) + if (input->users || xpad->xtype == XTYPE_XBOXONE) xpad_stop_input(xpad); mutex_unlock(&input->mutex); }
@@ -1656,7 +1670,7 @@ static int xpad_resume(struct usb_interface *intf) retval = xpad360w_start_input(xpad); } else { mutex_lock(&input->mutex); - if (input->users) + if (input->users || xpad->xtype == XTYPE_XBOXONE) retval = xpad_start_input(xpad); mutex_unlock(&input->mutex); }
--
2.7.4