Commit ffa6206e authored by Matthias Benkmann's avatar Matthias Benkmann Committed by Dmitry Torokhov
Browse files

Input: xpad - fix incorrectly applied patch for MAP_PROFILE_BUTTON 



When commit commit fff1011a ("Input: xpad - add X-Box Adaptive Profile
button") was applied, one hunk ended up in the wrong function; move it to
where it belongs.

Fixes: fff1011a ("Input: xpad - add X-Box Adaptive Profile button")
Signed-off-by: default avatarMatthias Benkmann <matthias.benkmann@gmail.com>
Link: https://lore.kernel.org/r/20230318162106.0aef4ba5@ninja


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 8a0432ba

drivers/input/joystick/xpad.c

+4 −3
Original line number Diff line number Diff line
@@ -781,9 +781,6 @@ static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *d 
	input_report_key(dev, BTN_C, data[8]);

	input_report_key(dev, BTN_Z, data[9]);



	/* Profile button has a value of 0-3, so it is reported as an axis */

	if (xpad->mapping & MAP_PROFILE_BUTTON)

		input_report_abs(dev, ABS_PROFILE, data[34]);



	input_sync(dev);

}
@@ -1061,6 +1058,10 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char 
					(__u16) le16_to_cpup((__le16 *)(data + 8)));

		}



		/* Profile button has a value of 0-3, so it is reported as an axis */

		if (xpad->mapping & MAP_PROFILE_BUTTON)

			input_report_abs(dev, ABS_PROFILE, data[34]);



		/* paddle handling */

		/* based on SDL's SDL_hidapi_xboxone.c */

		if (xpad->mapping & MAP_PADDLES) {