diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 20:27:17 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 20:27:25 (GMT) |
| commit | 63f2cd32fb5f8541636f47cc4c7c53cf8284851f (patch) | |
| tree | d8e66fde55f70332fd495907d529996e9568038b /drivers/input/input.c | |
| parent | 47d2261a3fa71cde24263559a4219a25e50d8c89 (diff) | |
| parent | 2acf1c25b979aaae983bfd7c0c4dd04b31ccfc01 (diff) | |
| download | linux-fsl-qoriq-63f2cd32fb5f8541636f47cc4c7c53cf8284851f.tar.xz | |
Merge remote-tracking branch 'stable/linux-3.12.y' into sdk-v1.6.x
Signed-off-by: Scott Wood <scottwood@freescale.com>
Conflicts:
drivers/mmc/card/block.c
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index e75d015..74f4798 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -1871,6 +1871,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; |