Merge branch 'next' into for-linus

[pandora-kernel.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 692435a..1c4c0db 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1909,6 +1909,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;