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

Commit ae22c464 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: ft5x06_ts: do not free input_dev after unregister it"

parents 003a7b03 896bbd2f

drivers/input/touchscreen/ft5x06_ts.c

+2 −5
Original line number Diff line number Diff line
@@ -2178,7 +2178,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) {
@@ -2539,9 +2540,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;

}
@@ -2565,7 +2563,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;

	}