[PATCH 4.9 111/206] Input: synaptics-rmi4 - unlock on error

From: Greg Kroah-Hartman
Date: Tue Jan 10 2017 - 09:35:55 EST


4.9-stable review patch. If anyone has any objections, please let me know.

------------------

From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>

commit 792f497b22afd0563b94dd8fa129a05f762a2c25 upstream.

We should unlock before returning on this error path.

Fixes: 3a762dbd5347 ('[media] Input: synaptics-rmi4 - add support for F54 diagnostics')
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/input/rmi4/rmi_f54.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/input/rmi4/rmi_f54.c
+++ b/drivers/input/rmi4/rmi_f54.c
@@ -200,7 +200,7 @@ static int rmi_f54_request_report(struct

error = rmi_write(rmi_dev, fn->fd.command_base_addr, F54_GET_REPORT);
if (error < 0)
- return error;
+ goto unlock;

init_completion(&f54->cmd_done);

@@ -209,9 +209,10 @@ static int rmi_f54_request_report(struct

queue_delayed_work(f54->workqueue, &f54->work, 0);

+unlock:
mutex_unlock(&f54->data_mutex);

- return 0;
+ return error;
}

static size_t rmi_f54_get_report_size(struct f54_data *f54)