Merge branch 'v3.10/topic/configs' of git://git.linaro.org/kernel/linux-linaro-stable...

[firefly-linux-kernel-4.4.55.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index c0446992892533b24d3853d043cf088451db5662..66984e272c459460b76b4fa0165497d79841cb71 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1866,6 +1866,10 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int
                break;
 
        case EV_ABS:
+               input_alloc_absinfo(dev);
+               if (!dev->absinfo)
+                       return;
+
                __set_bit(code, dev->absbit);
                break;