Commit fbe6a311 authored Oct 19, 2015 by Pavel Rojtberg Committed by Dmitry Torokhov Oct 19, 2015

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>

parent 9378c025

drivers/input/joystick/xpad.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -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 */
		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: