Skip to content

Commit

Permalink
Input: synaptics-rmi4 - do not delete interrupt memory too early
Browse files Browse the repository at this point in the history
commit a1ab690 upstream.

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.

Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Dmitry Torokhov authored and Greg Kroah-Hartman committed Feb 3, 2018
1 parent e66aa9b commit 589aadd
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/input/rmi4/rmi_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

/* 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);
data->irq_memory = NULL;
data->irq_status = NULL;
Expand All @@ -50,13 +57,6 @@ void rmi_free_function_list(struct rmi_device *rmi_dev)

data->f01_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)
Expand Down

0 comments on commit 589aadd

Please sign in to comment.