Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f26889b4 authored by Mao Li's avatar Mao Li Committed by Gerrit - the friendly Code Review server
Browse files

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.

This patch is propagated from msm-3.10 kernel.
(commit: 896bbd2f9c98f157f2244e7f2f6dba790e50cf00
input: ft5x06_ts: do not free input_dev after unregister it)

Change-Id: I7abee3f1ad6c73e1c38aa64e627ffd73f6f9d3b2
Signed-off-by: default avatarMao Li <maol@codeaurora.org>
parent 5cc0bff8

drivers/input/touchscreen/ft5x06_ts.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

	}