]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Input: synaptics-rmi4 - unlock on error
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 17 Nov 2016 01:23:22 +0000 (17:23 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 17 Nov 2016 01:31:26 +0000 (17:31 -0800)
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>
drivers/input/rmi4/rmi_f54.c

index cf805b960866215f52e96b2ae9a21ae373ddedfb..2e934aef3d2a8b675635fcdf9ccd4af807c4ef87 100644 (file)
@@ -200,7 +200,7 @@ static int rmi_f54_request_report(struct rmi_function *fn, u8 report_type)
 
        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 rmi_function *fn, u8 report_type)
 
        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)