diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-11-16 20:23:22 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-11-16 20:31:26 -0500 |
commit | 792f497b22afd0563b94dd8fa129a05f762a2c25 (patch) | |
tree | bc00a243bc03828bea163c2bd56f5991b2da5284 /drivers/input | |
parent | 82264d0cf7aef2247563c031ff2ab96579d5d0cc (diff) |
Input: synaptics-rmi4 - unlock on error
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@oracle.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/rmi4/rmi_f54.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/rmi4/rmi_f54.c b/drivers/input/rmi4/rmi_f54.c index cf805b960866..2e934aef3d2a 100644 --- 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 rmi_function *fn, u8 report_type) | |||
200 | 200 | ||
201 | error = rmi_write(rmi_dev, fn->fd.command_base_addr, F54_GET_REPORT); | 201 | error = rmi_write(rmi_dev, fn->fd.command_base_addr, F54_GET_REPORT); |
202 | if (error < 0) | 202 | if (error < 0) |
203 | return error; | 203 | goto unlock; |
204 | 204 | ||
205 | init_completion(&f54->cmd_done); | 205 | init_completion(&f54->cmd_done); |
206 | 206 | ||
@@ -209,9 +209,10 @@ static int rmi_f54_request_report(struct rmi_function *fn, u8 report_type) | |||
209 | 209 | ||
210 | queue_delayed_work(f54->workqueue, &f54->work, 0); | 210 | queue_delayed_work(f54->workqueue, &f54->work, 0); |
211 | 211 | ||
212 | unlock: | ||
212 | mutex_unlock(&f54->data_mutex); | 213 | mutex_unlock(&f54->data_mutex); |
213 | 214 | ||
214 | return 0; | 215 | return error; |
215 | } | 216 | } |
216 | 217 | ||
217 | static size_t rmi_f54_get_report_size(struct f54_data *f54) | 218 | static size_t rmi_f54_get_report_size(struct f54_data *f54) |