Commit 6fe38a26 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.15/usb-hidbp' into for-linus 

- fix for LED_KANA handling in hidbp (junan)
parents 795b318f d73a4bfa

drivers/hid/usbhid/usbkbd.c

+1 −1
Original line number Diff line number Diff line
@@ -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));