1 files changed, 13 insertions, 7 deletions

diff --git a/drivers/input/input.c b/drivers/input/input.c
index fb3a2c112deb..f075fbbfb1e7 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -240,24 +240,30 @@ static void input_handle_event(struct input_dev *dev,
                 break;
 
         case EV_KEY:
-                if (is_event_supported(code, dev->keybit, KEY_MAX) &&
-                    !!test_bit(code, dev->key) != value) {
+                if (is_event_supported(code, dev->keybit, KEY_MAX)) {
+
+                        /* auto-repeat bypasses state updates */
+                        if (value == 2) {
+                                disposition = INPUT_PASS_TO_HANDLERS;
+                                break;
+                        }
+
+                        if (!!test_bit(code, dev->key) != !!value) {
 
-                        if (value != 2) {
                                 __change_bit(code, dev->key);
+                                disposition = INPUT_PASS_TO_HANDLERS;
+
                                 if (value)
                                         input_start_autorepeat(dev, code);
                                 else
                                         input_stop_autorepeat(dev);
                         }
-
-                        disposition = INPUT_PASS_TO_HANDLERS;
                 }
                 break;
 
         case EV_SW:
                 if (is_event_supported(code, dev->swbit, SW_MAX) &&
-                    !!test_bit(code, dev->sw) != value) {
+                    !!test_bit(code, dev->sw) != !!value) {
 
                         __change_bit(code, dev->sw);
                         disposition = INPUT_PASS_TO_HANDLERS;
@@ -284,7 +290,7 @@ static void input_handle_event(struct input_dev *dev,
 
         case EV_LED:
                 if (is_event_supported(code, dev->ledbit, LED_MAX) &&
-                    !!test_bit(code, dev->led) != value) {
+                    !!test_bit(code, dev->led) != !!value) {
 
                         __change_bit(code, dev->led);
                         disposition = INPUT_PASS_TO_ALL;