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

[linux-2.6.git] / drivers / input / evdev.c

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 93b407cd46009ed895007d60284b94c6f34caaa8..be6b93c20f606b9e477746e81688d7abe25bcdda 100644 (file)
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/major.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/major.h>

-#include <linux/smp_lock.h>

 #include <linux/device.h>
 #include <linux/compat.h>
 
 #include <linux/device.h>
 #include <linux/compat.h>
 


@@ -337,7 +336,7 @@ static int bits_to_user(unsigned long *bits, unsigned int maxbit,
 
        if (compat) {
                len = NBITS_COMPAT(maxbit) * sizeof(compat_long_t);
 
        if (compat) {
                len = NBITS_COMPAT(maxbit) * sizeof(compat_long_t);

-               if (len < maxlen)
+               if (len > maxlen)

                        len = maxlen;
 
                for (i = 0; i < len / sizeof(compat_long_t); i++)
                        len = maxlen;
 
                for (i = 0; i < len / sizeof(compat_long_t); i++)