mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2025-04-19 20:58:31 +09:00
Merge branch 'for-6.15/steam' into for-linus
- code cleanup (Vicki Pfau)
This commit is contained in:
commit
795b318f05
@ -559,15 +559,13 @@ static void steam_set_lizard_mode(struct steam_device *steam, bool enable)
|
||||
if (steam->gamepad_mode)
|
||||
enable = false;
|
||||
|
||||
mutex_lock(&steam->report_mutex);
|
||||
if (enable) {
|
||||
mutex_lock(&steam->report_mutex);
|
||||
/* enable esc, enter, cursors */
|
||||
steam_send_report_byte(steam, ID_SET_DEFAULT_DIGITAL_MAPPINGS);
|
||||
/* reset settings */
|
||||
steam_send_report_byte(steam, ID_LOAD_DEFAULT_SETTINGS);
|
||||
mutex_unlock(&steam->report_mutex);
|
||||
} else {
|
||||
mutex_lock(&steam->report_mutex);
|
||||
/* disable esc, enter, cursor */
|
||||
steam_send_report_byte(steam, ID_CLEAR_DIGITAL_MAPPINGS);
|
||||
|
||||
@ -579,15 +577,14 @@ static void steam_set_lizard_mode(struct steam_device *steam, bool enable)
|
||||
SETTING_RIGHT_TRACKPAD_CLICK_PRESSURE, 0xFFFF, /* disable haptic click */
|
||||
SETTING_STEAM_WATCHDOG_ENABLE, 0, /* disable watchdog that tests if Steam is active */
|
||||
0);
|
||||
mutex_unlock(&steam->report_mutex);
|
||||
} else {
|
||||
steam_write_settings(steam,
|
||||
SETTING_LEFT_TRACKPAD_MODE, TRACKPAD_NONE, /* disable mouse */
|
||||
SETTING_RIGHT_TRACKPAD_MODE, TRACKPAD_NONE, /* disable mouse */
|
||||
0);
|
||||
mutex_unlock(&steam->report_mutex);
|
||||
}
|
||||
}
|
||||
mutex_unlock(&steam->report_mutex);
|
||||
}
|
||||
|
||||
static int steam_input_open(struct input_dev *dev)
|
||||
|
Loading…
x
Reference in New Issue
Block a user