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

Pull input updates from Dmitry Torokhov:
 "A big update to the Atmel touchscreen driver, devm support for polled
  input devices, several drivers have been converted to using managed
  resources, and assorted driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (87 commits)
  Input: synaptics - fix resolution for manually provided min/max
  Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version
  Input: max8997_haptic - add error handling for regulator and pwm
  Input: elantech - don't set bit 1 of reg_10 when the no_hw_res quirk is set
  Input: elantech - deal with clickpads reporting right button events
  Input: edt-ft5x06 - fix an i2c write for M09 support
  Input: omap-keypad - remove platform data support
  ARM: OMAP2+: remove unused omap4-keypad file and code
  Input: ab8500-ponkey - switch to using managed resources
  Input: max8925_onkey - switch to using managed resources
  Input: 88pm860x-ts - switch to using managed resources
  Input: 88pm860x_onkey - switch to using managed resources
  Input: intel-mid-touch - switch to using managed resources
  Input: wacom - process outbound for newer Cintiqs
  Input: wacom - set stylus_in_proximity when pen is in range
  DTS: ARM: OMAP3-N900: Add tsc2005 support
  Input: tsc2005 - add DT support
  Input: add common DT binding for touchscreens
  Input: jornada680_kbd - switch top using managed resources
  Input: adp5520-keys - switch to using managed resources
  ...

1 files changed, 0 insertions, 18 deletions

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index ce953d895f5b..fd325ec9f064 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -629,12 +629,10 @@ static int str_to_user(const char *str, unsigned int maxlen, void __user *p)
         return copy_to_user(p, str, len) ? -EFAULT : len;
 }
 
-#define OLD_KEY_MAX     0x1ff
 static int handle_eviocgbit(struct input_dev *dev,
                             unsigned int type, unsigned int size,
                             void __user *p, int compat_mode)
 {
-        static unsigned long keymax_warn_time;
         unsigned long *bits;
         int len;
 
@@ -652,24 +650,8 @@ static int handle_eviocgbit(struct input_dev *dev,
         default: return -EINVAL;
         }
 
-        /*
-         * Work around bugs in userspace programs that like to do
-         * EVIOCGBIT(EV_KEY, KEY_MAX) and not realize that 'len'
-         * should be in bytes, not in bits.
-         */
-        if (type == EV_KEY && size == OLD_KEY_MAX) {
-                len = OLD_KEY_MAX;
-                if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000))
-                        pr_warning("(EVIOCGBIT): Suspicious buffer size %u, "
-                                   "limiting output to %zu bytes. See "
-                                   "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n",
-                                   OLD_KEY_MAX,
-                                   BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long));
-        }
-
         return bits_to_user(bits, len, size, p, compat_mode);
 }
-#undef OLD_KEY_MAX
 
 static int evdev_handle_get_keycode(struct input_dev *dev, void __user *p)
 {