Commit 58e4aeee authored by Stephen Warren's avatar Stephen Warren Committed by Dmitry Torokhov

Input: atmel_mxt_ts - fix double free of input device

[Nick Dyer: reworked to move free of input device into separate function
and only call in paths that require it.]
Signed-off-by: default avatarNick Dyer <nick.dyer@itdev.co.uk>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 5715fc76
...@@ -1379,11 +1379,16 @@ static int mxt_get_info(struct mxt_data *data) ...@@ -1379,11 +1379,16 @@ static int mxt_get_info(struct mxt_data *data)
return 0; return 0;
} }
static void mxt_free_object_table(struct mxt_data *data) static void mxt_free_input_device(struct mxt_data *data)
{ {
if (data->input_dev) {
input_unregister_device(data->input_dev); input_unregister_device(data->input_dev);
data->input_dev = NULL; data->input_dev = NULL;
}
}
static void mxt_free_object_table(struct mxt_data *data)
{
kfree(data->object_table); kfree(data->object_table);
data->object_table = NULL; data->object_table = NULL;
kfree(data->msg_buf); kfree(data->msg_buf);
...@@ -1962,11 +1967,13 @@ static int mxt_load_fw(struct device *dev, const char *fn) ...@@ -1962,11 +1967,13 @@ static int mxt_load_fw(struct device *dev, const char *fn)
ret = mxt_lookup_bootloader_address(data, 0); ret = mxt_lookup_bootloader_address(data, 0);
if (ret) if (ret)
goto release_firmware; goto release_firmware;
mxt_free_input_device(data);
mxt_free_object_table(data);
} else { } else {
enable_irq(data->irq); enable_irq(data->irq);
} }
mxt_free_object_table(data);
reinit_completion(&data->bl_completion); reinit_completion(&data->bl_completion);
ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD, false); ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD, false);
...@@ -2215,6 +2222,7 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -2215,6 +2222,7 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
return 0; return 0;
err_free_object: err_free_object:
mxt_free_input_device(data);
mxt_free_object_table(data); mxt_free_object_table(data);
err_free_irq: err_free_irq:
free_irq(client->irq, data); free_irq(client->irq, data);
...@@ -2229,7 +2237,7 @@ static int mxt_remove(struct i2c_client *client) ...@@ -2229,7 +2237,7 @@ static int mxt_remove(struct i2c_client *client)
sysfs_remove_group(&client->dev.kobj, &mxt_attr_group); sysfs_remove_group(&client->dev.kobj, &mxt_attr_group);
free_irq(data->irq, data); free_irq(data->irq, data);
input_unregister_device(data->input_dev); mxt_free_input_device(data);
mxt_free_object_table(data); mxt_free_object_table(data);
kfree(data); kfree(data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment