diff options
| author | Mao Li <maol@codeaurora.org> | 2014-12-15 03:39:50 -0500 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-30 22:15:45 -0700 |
| commit | eb86decf8fc599a501e1e71c36928fa8083d9ab8 (patch) | |
| tree | 42cc23898e94b916d2f7010f03ec04a95ba17af0 | |
| parent | 1a0b4f1561faf55daa315ae6473f885808df90f8 (diff) | |
input: ft5x06_ts: do not free input_dev after unregister it
Once the input device is successfully registered via
input_register_device(), it has to be unregistered via
input_unregister_device(); input_free_device()
should not be called in this case. input_unregister_device()
frees the input device, hence the call to input_free_device()
is a double free. This is also described in comments of
input_unregister_device().
Reorganize the code to avoid a double free.
Change-Id: I7abee3f1ad6c73e1c38aa64e627ffd73f6f9d3b2
Signed-off-by: Mao Li <maol@codeaurora.org>
| -rw-r--r-- | drivers/input/touchscreen/ft5x06_ts.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/ft5x06_ts.c b/drivers/input/touchscreen/ft5x06_ts.c index 2a05d31d8f2e..7269f85edfe8 100644 --- a/drivers/input/touchscreen/ft5x06_ts.c +++ b/drivers/input/touchscreen/ft5x06_ts.c @@ -2175,7 +2175,8 @@ static int ft5x06_ts_probe(struct i2c_client *client, err = input_register_device(input_dev); if (err) { dev_err(&client->dev, "Input device registration failed\n"); - goto free_inputdev; + input_free_device(input_dev); + return err; } if (pdata->power_init) { @@ -2534,9 +2535,6 @@ pwr_deinit: ft5x06_power_init(data, false); unreg_inputdev: input_unregister_device(input_dev); -free_inputdev: - input_free_device(input_dev); - input_dev = NULL; return err; } @@ -2560,7 +2558,6 @@ static int ft5x06_ts_remove(struct i2c_client *client) device_init_wakeup(&client->dev, 0); sensors_classdev_unregister(&data->psensor_pdata->ps_cdev); input_unregister_device(data->psensor_pdata->input_psensor_dev); - input_free_device(data->psensor_pdata->input_psensor_dev); devm_kfree(&client->dev, data->psensor_pdata); data->psensor_pdata = NULL; } |