Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[~andy/linux] / drivers / input / input-compat.c

diff --git a/drivers/input/input-compat.c b/drivers/input/input-compat.c
index e46a86776a6bd247d47bd92dbbaa2e0c8657c9b7..64ca7113ff28cb25ee301ddb5adf3c049cec9c9c 100644 (file)
--- a/drivers/input/input-compat.c
+++ b/drivers/input/input-compat.c
@@ -17,7 +17,7 @@
 int input_event_from_user(const char __user *buffer,
                          struct input_event *event)
 {
-       if (INPUT_COMPAT_TEST) {
+       if (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) {
                struct input_event_compat compat_event;
 
                if (copy_from_user(&compat_event, buffer,
@@ -41,7 +41,7 @@ int input_event_from_user(const char __user *buffer,
 int input_event_to_user(char __user *buffer,
                        const struct input_event *event)
 {
-       if (INPUT_COMPAT_TEST) {
+       if (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) {
                struct input_event_compat compat_event;
 
                compat_event.time.tv_sec = event->time.tv_sec;