summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.com>2025-03-26 13:56:11 +0100
committerJiri Kosina <jkosina@suse.com>2025-03-26 13:56:11 +0100
commit6fe38a26b25a45f43f44185f45c829ad0af4e842 (patch)
tree6dde14a1fd3ad104dcc36ae9140520555ee489bd
parent795b318f0577e380292a1fb794f706a95fed225d (diff)
parentd73a4bfa2881a6859b384b75a414c33d4898b055 (diff)
Merge branch 'for-6.15/usb-hidbp' into for-linus
- fix for LED_KANA handling in hidbp (junan)
-rw-r--r--drivers/hid/usbhid/usbkbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index c439ed2f16db..af6bc76dbf64 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -160,7 +160,7 @@ static int usb_kbd_event(struct input_dev *dev, unsigned int type,
return -1;
spin_lock_irqsave(&kbd->leds_lock, flags);
- kbd->newleds = (!!test_bit(LED_KANA, dev->led) << 3) | (!!test_bit(LED_COMPOSE, dev->led) << 3) |
+ kbd->newleds = (!!test_bit(LED_KANA, dev->led) << 4) | (!!test_bit(LED_COMPOSE, dev->led) << 3) |
(!!test_bit(LED_SCROLLL, dev->led) << 2) | (!!test_bit(LED_CAPSL, dev->led) << 1) |
(!!test_bit(LED_NUML, dev->led));