summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorJingkui Wang <jkwang@google.com>2016-12-12 13:51:46 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-12-12 14:20:30 -0800
commit5a8a6b89c15766446d845671d574a9243b6d8786 (patch)
tree0c8c2f123e41b0a73db3f649d7e9bf124574a65f /drivers/input
parent74c82dae6c474933f2be401976e1530b5f623221 (diff)
downloadblackbird-op-linux-5a8a6b89c15766446d845671d574a9243b6d8786.tar.gz
blackbird-op-linux-5a8a6b89c15766446d845671d574a9243b6d8786.zip
Input: drv260x - fix input device's parent assignment
We were assigning I2C bus controller instead of client as parent device. Besides being logically wrong, it messed up with devm handling of input device. As a result we were leaving input device and event node behind after rmmod-ing the driver, which lead to a kernel oops if one were to access the event node later. Let's remove the assignment and rely on devm_input_allocate_device() to set it up properly for us. Signed-off-by: Jingkui Wang <jkwang@google.com> Fixes: 7132fe4f5687 ("Input: drv260x - add TI drv260x haptics driver") Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/drv260x.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c
index 9789d4fb6e51..251d64ca41ce 100644
--- a/drivers/input/misc/drv260x.c
+++ b/drivers/input/misc/drv260x.c
@@ -592,7 +592,6 @@ static int drv260x_probe(struct i2c_client *client,
}
haptics->input_dev->name = "drv260x:haptics";
- haptics->input_dev->dev.parent = client->dev.parent;
haptics->input_dev->close = drv260x_close;
input_set_drvdata(haptics->input_dev, haptics);
input_set_capability(haptics->input_dev, EV_FF, FF_RUMBLE);
OpenPOWER on IntegriCloud