evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input: ft5x06_ts: do not free input_dev after unregister it

Browse source 
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>
This commit is contained in:
Mao Li 2014-12-15 03:39:50 -05:00 • committed by Gerrit - the friendly Code Review server
parent 1a0b4f1561
commit eb86decf8f
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/input/touchscreen/ft5x06_ts.c
View file

@ -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;
}