Commit a1ab6902 authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: synaptics-rmi4 - do not delete interrupt memory too early

We want to free memory reserved for interrupt mask handling only after we
free functions, as function drivers might want to mask interrupts. This is
needed for the followup patch to the F03 that would implement unmasking and
masking interrupts from the serio pass-through port open() and close()
methods.

Cc: stable@vger.kernel.org
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent fbe6a536
...@@ -41,6 +41,13 @@ void rmi_free_function_list(struct rmi_device *rmi_dev) ...@@ -41,6 +41,13 @@ void rmi_free_function_list(struct rmi_device *rmi_dev)
rmi_dbg(RMI_DEBUG_CORE, &rmi_dev->dev, "Freeing function list\n"); rmi_dbg(RMI_DEBUG_CORE, &rmi_dev->dev, "Freeing function list\n");
/* Doing it in the reverse order so F01 will be removed last */
list_for_each_entry_safe_reverse(fn, tmp,
&data->function_list, node) {
list_del(&fn->node);
rmi_unregister_function(fn);
}
devm_kfree(&rmi_dev->dev, data->irq_memory); devm_kfree(&rmi_dev->dev, data->irq_memory);
data->irq_memory = NULL; data->irq_memory = NULL;
data->irq_status = NULL; data->irq_status = NULL;
...@@ -50,13 +57,6 @@ void rmi_free_function_list(struct rmi_device *rmi_dev) ...@@ -50,13 +57,6 @@ void rmi_free_function_list(struct rmi_device *rmi_dev)
data->f01_container = NULL; data->f01_container = NULL;
data->f34_container = NULL; data->f34_container = NULL;
/* Doing it in the reverse order so F01 will be removed last */
list_for_each_entry_safe_reverse(fn, tmp,
&data->function_list, node) {
list_del(&fn->node);
rmi_unregister_function(fn);
}
} }
static int reset_one_function(struct rmi_function *fn) static int reset_one_function(struct rmi_function *fn)
......
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