Commit fbe6a311 authored by Pavel Rojtberg's avatar Pavel Rojtberg Committed by Dmitry Torokhov

Input: xpad - fix clash of presence handling with LED setting

Do not call xpad_identify_controller at init with wireless devices: it
conflicts with the already sent presence packet and will be called by
xpad360w_process_packet as needed anyway.
Signed-off-by: default avatarPavel Rojtberg <rojtberg@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 9378c025
...@@ -1001,8 +1001,15 @@ static int xpad_led_probe(struct usb_xpad *xpad) ...@@ -1001,8 +1001,15 @@ static int xpad_led_probe(struct usb_xpad *xpad)
if (error) if (error)
goto err_free_id; goto err_free_id;
/* Light up the segment corresponding to controller number */ if (xpad->xtype == XTYPE_XBOX360) {
/*
* Light up the segment corresponding to controller
* number on wired devices. On wireless we'll do that
* when they respond to "presence" packet.
*/
xpad_identify_controller(xpad); xpad_identify_controller(xpad);
}
return 0; return 0;
err_free_id: err_free_id:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment