aboutsummaryrefslogtreecommitdiffstats
path: root/protocol/pjrc/usb.c
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-11-28 16:02:29 +0900
committertmk <nobody@nowhere>2013-11-28 16:02:29 +0900
commitbc5b64d83259715667356770965a33aa620a8030 (patch)
tree074377caef4d838ac3890f39e9ff67f346aab506 /protocol/pjrc/usb.c
parent4e36159be226e544dfebbe06b1955261951209a4 (diff)
parent0b9c0f6012a90eeb8cced9feccf3a65d8b4e5535 (diff)
downloadfirmware-bc5b64d83259715667356770965a33aa620a8030.tar.gz
firmware-bc5b64d83259715667356770965a33aa620a8030.tar.bz2
firmware-bc5b64d83259715667356770965a33aa620a8030.zip
Merge branch 'ps2_keyboard_fix'
Diffstat (limited to 'protocol/pjrc/usb.c')
-rw-r--r--protocol/pjrc/usb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/protocol/pjrc/usb.c b/protocol/pjrc/usb.c
index 84c99972f..393b36f78 100644
--- a/protocol/pjrc/usb.c
+++ b/protocol/pjrc/usb.c
@@ -662,8 +662,9 @@ ISR(USB_GEN_vect)
suspend_wakeup_init();
#ifdef SLEEP_LED_ENABLE
sleep_led_disable();
-#endif
+ // NOTE: converters may not accept this
led_set(host_keyboard_leds());
+#endif
UDIEN |= (1<<SUSPE);
UDIEN &= ~(1<<WAKEUPE);