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>

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index d382d48d6750..fd4100d56d8c 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -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: