summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingkui Wang <jkwang@google.com>2016-12-12 13:51:46 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-09 08:32:24 +0100
commitafd2a1994ea4e37fb602410b350827d5909714fe (patch)
tree735359972d29f8700336f0f8cf793b3cc5ed57c2
parente5d92c0c84f3b821c65210ab20bb4583879a03c9 (diff)
Input: drv260x - fix input device's parent assignment
commit 5a8a6b89c15766446d845671d574a9243b6d8786 upstream. 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") Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 2adfd86c869a..930424e55439 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);