diff --git a/drivers/staging/nvec/nvec_event.c b/drivers/staging/nvec/nvec_event.c
index 5524468..f533055 100644
--- a/drivers/staging/nvec/nvec_event.c
+++ b/drivers/staging/nvec/nvec_event.c
@@ -52,18 +52,10 @@ static int nvec_event_notifier(struct notifier_block *nb,
        return NOTIFY_DONE;

    switch (event->payload[2]) {
-#if 0
-   case -1:        /* invalid */
-       input_report_key(event_handler.sleep, KEY_SLEEP, 1);
-       input_sync(event_handler.sleep);
-       input_report_key(event_handler.sleep, KEY_SLEEP, 1);
-       input_sync(event_handler.sleep);
-       break;
-#endif
    case 0x80:      /* short power button press */
-       input_report_key(event_handler.power, KEY_POWER, 1);
+       input_report_key(event_handler.power, KEY_SLEEP, 1);
        input_sync(event_handler.power);
-       input_report_key(event_handler.power, KEY_POWER, 0);
+       input_report_key(event_handler.power, KEY_SLEEP, 0);
        input_sync(event_handler.power);
        break;
    case 0x02:      /* lid close */
diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c
index a4ce5a7..6e725eb 100644
--- a/drivers/staging/nvec/nvec_kbd.c
+++ b/drivers/staging/nvec/nvec_kbd.c
@@ -57,8 +57,13 @@ static int nvec_keys_notifier(struct notifier_block *nb,
        int _size = (msg[0] & (3 << 5)) >> 5;

 /* power on/off button */
-       if (_size == NVEC_VAR_SIZE)
+       if (_size == NVEC_VAR_SIZE) {
+           input_report_key(keys_dev.input, KEY_POWER, 1);
+           input_sync(keys_dev.input);
+           sleep(2);
+           input_report_key(keys_dev.input, KEY_POWER, 0);
+           input_sync(keys_dev.input);
            return NOTIFY_STOP;
+       }

        if (_size == NVEC_3BYTES)
            msg++;