From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
Date: Sun, 26 Sep 2021 04:42:48 +0000 (-0500)
Subject: tty/sysrq: More intuitive Shift handling
X-Git-Tag: v5.16-rc1~117^2~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3aee752cd0b880b052b2757278227d09673a2abd;p=thirdparty%2Fkernel%2Flinux.git

tty/sysrq: More intuitive Shift handling

Make Alt-SysRq-Shift-<key> behave like Alt-Shift-SysRq-<key>.

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
Link: https://lore.kernel.org/r/YU/6SCmUr9qGkqBu@dj3ntoo
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index c911196ac8935..4d3dbe62daf88 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -843,6 +843,8 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
 			sysrq->shift = KEY_RESERVED;
 		else if (value != 2)
 			sysrq->shift = code;
+		if (sysrq->active)
+			sysrq->shift_use = sysrq->shift;
 		break;
 
 	case KEY_SYSRQ: