summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2017-01-15 14:44:05 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-15 17:13:10 +0100
commitaa4af0fca1016e1962154572fdc8ccdd1cb0a2b5 (patch)
tree97844b65bf19de3a3926f466ff984d1427437cc3 /drivers/input
parent0a731928f2649fe2cf2b00dd4b69970b7b3f8e6d (diff)
downloadlinux-stable-aa4af0fca1016e1962154572fdc8ccdd1cb0a2b5.tar.gz
linux-stable-aa4af0fca1016e1962154572fdc8ccdd1cb0a2b5.tar.bz2
linux-stable-aa4af0fca1016e1962154572fdc8ccdd1cb0a2b5.zip
Input: mpr121 - set missing event capability
[ Upstream commit 9723ddc8fe0d76ce41fe0dc16afb241ec7d0a29d ] This driver reports misc scan input events on the sensor's status register changes. But the event capability for them was not set in the device initialization, so these events were ignored. This change adds the missing event capability. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/mpr121_touchkey.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/mpr121_touchkey.c b/drivers/input/keyboard/mpr121_touchkey.c
index 088a9f7c954e..aaf43befffaa 100644
--- a/drivers/input/keyboard/mpr121_touchkey.c
+++ b/drivers/input/keyboard/mpr121_touchkey.c
@@ -236,6 +236,7 @@ static int mpr_touchkey_probe(struct i2c_client *client,
input_dev->id.bustype = BUS_I2C;
input_dev->dev.parent = &client->dev;
input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
+ input_set_capability(input_dev, EV_MSC, MSC_SCAN);
input_dev->keycode = mpr121->keycodes;
input_dev->keycodesize = sizeof(mpr121->keycodes[0]);