瀏覽代碼

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>
Dan Carpenter 8 年之前
父節點
當前提交
792f497b22
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      drivers/input/rmi4/rmi_f54.c

+ 3 - 2
drivers/input/rmi4/rmi_f54.c

@@ -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);
 	error = rmi_write(rmi_dev, fn->fd.command_base_addr, F54_GET_REPORT);
 	if (error < 0)
 	if (error < 0)
-		return error;
+		goto unlock;
 
 
 	init_completion(&f54->cmd_done);
 	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);
 	queue_delayed_work(f54->workqueue, &f54->work, 0);
 
 
+unlock:
 	mutex_unlock(&f54->data_mutex);
 	mutex_unlock(&f54->data_mutex);
 
 
-	return 0;
+	return error;
 }
 }
 
 
 static size_t rmi_f54_get_report_size(struct f54_data *f54)
 static size_t rmi_f54_get_report_size(struct f54_data *f54)