2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 4d4985b59abf..1ad8c2ee7dbf 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -208,6 +208,7 @@ struct atkbd {
         unsigned char resend;
         unsigned char release;
         unsigned char bat_xl;
+        unsigned char err_xl;
         unsigned int last;
         unsigned long time;
 };
@@ -296,15 +297,18 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
                 if (atkbd->emul ||
                     !(code == ATKBD_RET_EMUL0 || code == ATKBD_RET_EMUL1 ||
                       code == ATKBD_RET_HANGUEL || code == ATKBD_RET_HANJA ||
-                      code == ATKBD_RET_ERR ||
+                     (code == ATKBD_RET_ERR && !atkbd->err_xl) ||
                      (code == ATKBD_RET_BAT && !atkbd->bat_xl))) {
                         atkbd->release = code >> 7;
                         code &= 0x7f;
                 }
 
-                if (!atkbd->emul &&
-                     (code & 0x7f) == (ATKBD_RET_BAT & 0x7f))
+                if (!atkbd->emul) {
+                     if ((code & 0x7f) == (ATKBD_RET_BAT & 0x7f))
                         atkbd->bat_xl = !atkbd->release;
+                     if ((code & 0x7f) == (ATKBD_RET_ERR & 0x7f))
+                        atkbd->err_xl = !atkbd->release;
+                }
         }
 
         switch (code) {
diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c
index 596964ceb96d..4bae5d89348d 100644
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
@@ -44,7 +44,7 @@ MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
 static unsigned char sunkbd_keycode[128] = {
-          0,128,114,129,115, 59, 60, 68, 61, 87, 62, 88, 63,100, 64,  0,
+          0,128,114,129,115, 59, 60, 68, 61, 87, 62, 88, 63,100, 64,112,
          65, 66, 67, 56,103,119, 99, 70,105,130,131,108,106,  1,  2,  3,
           4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 41, 14,110,113, 98, 55,
         116,132, 83,133,102, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,