Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[sfrench/cifs-2.6.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 408df0bd6be50a0b17798b189506c266d0ba34bf..c13ced3e0d3dfe7d0db777776c1b51a2cf4f59e5 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -242,7 +242,7 @@ static void input_handle_event(struct input_dev *dev,
                break;
        }
 
-       if (type != EV_SYN)
+       if (disposition != INPUT_IGNORE_EVENT && type != EV_SYN)
                dev->sync = 0;
 
        if ((disposition & INPUT_PASS_TO_DEVICE) && dev->event)