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: Pavel Rojtberg <rojtberg@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Pavel Rojtberg 2015-10-19 00:06:58 -07:00 committed by Dmitry Torokhov
parent 9378c0251c
commit fbe6a31144

View file

@ -1001,8 +1001,15 @@ static int xpad_led_probe(struct usb_xpad *xpad)
if (error)
goto err_free_id;
/* Light up the segment corresponding to controller number */
xpad_identify_controller(xpad);
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);
}
return 0;
err_free_id: