HID: hid-steam: Fix issues with disabling both gamepad mode and lizard mode

When lizard mode is disabled, there were two issues:

1. Switching between gamepad mode and desktop mode still functioned, even
though desktop mode did not. This lead to the ability to "break" gamepad mode
by holding down the Options key even while lizard mode is disabled

2. If you were in desktop mode when lizard mode is disabled, you would
immediately enter this faulty mode.

This patch properly disables the ability to switch between gamepad mode and the
faulty desktop mode by holding the Options key, as well as effectively removing
the faulty mode by bypassing the early returns if lizard mode is disabled.

Reported-by: Eugeny Shcheglov <eugenyshcheglov@gmail.com>
Signed-off-by: Vicki Pfau <vi@endrift.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c
index af38fc8eb34fd3b6cd9f39f2495a3aff5717294d..b008fd0834b94cdbeaa98ee33dd321bfb73c8ac9 100644 (file)
--- a/drivers/hid/hid-steam.c
+++ b/drivers/hid/hid-steam.c
@@ -1050,10 +1050,10 @@ static void steam_mode_switch_cb(struct work_struct *work)
                                                        struct steam_device, mode_switch);
        unsigned long flags;
        bool client_opened;
-       steam->gamepad_mode = !steam->gamepad_mode;
        if (!lizard_mode)
                return;
 
+       steam->gamepad_mode = !steam->gamepad_mode;
        if (steam->gamepad_mode)
                steam_set_lizard_mode(steam, false);
        else {
@@ -1599,7 +1599,7 @@ static void steam_do_deck_input_event(struct steam_device *steam,
                schedule_delayed_work(&steam->mode_switch, 45 * HZ / 100);
        }
 
-       if (!steam->gamepad_mode)
+       if (!steam->gamepad_mode && lizard_mode)
                return;
 
        lpad_touched = b10 & BIT(3);
@@ -1669,7 +1669,7 @@ static void steam_do_deck_sensors_event(struct steam_device *steam,
         */
        steam->sensor_timestamp_us += 4000;
 
-       if (!steam->gamepad_mode)
+       if (!steam->gamepad_mode && lizard_mode)
                return;
 
        input_event(sensors, EV_MSC, MSC_TIMESTAMP, steam->sensor_timestamp_us);