MIME-Version: 1.0
From:   Matthias Benkmann <matthias.benkmann@gmail.com>
Date:   Sat, 18 Mar 2023 15:41:25 +0100
Message-ID: <CAK4gqCCk7ipRbZ=LM8Nsj+nE2S6v6QN39ziYSr3d2NmVMHULYg@mail.gmail.com>
Subject: [PATCH v2] Fix incorrectly applied patch for MAP_PROFILE_BUTTON
To:     linux-input@vger.kernel.org
Cc:     dmitry.torokhov@gmail.com, Nate Yocom <nate@yocom.org>,
        hadess@hadess.net, benjamin.tissoires@redhat.com,
        linux-kernel@vger.kernel.org, Pavel Rojtberg <rojtberg@gmail.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

When the linked patch was applied,
one hunk ended up in the wrong function. This patch moves it to where
it probably belongs.

Link: https://lore.kernel.org/all/20220908173930.28940-6-nate@yocom.org/
Fixes: fff1011a26d6 (Input: xpad - add X-Box Adaptive Profile button)
Signed-off-by: Matthias Benkmann <matthias.benkmann@gmail.com>

---
 drivers/input/joystick/xpad.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index f642ec8e92dd..29131f1a2f06 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -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) {
-- 
2.25.1