lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "soc: qcom: Fix smcinvoke_obj->fd assignment"

Browse Source
This commit is contained in:
qctecmdr 2020-11-24 12:44:43 -08:00 committed by Gerrit - the friendly Code Review server
commit 2d133aadb4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/soc/qcom/smcinvoke.c
View File

@ -1164,8 +1164,7 @@ static int marshal_out_invoke_req(const uint8_t *buf, uint32_t buf_size,
TZHANDLE_GET_SERVER(tz_args->handle), TZHANDLE_GET_SERVER(tz_args->handle),
&temp_fd, NO_LOCK); &temp_fd, NO_LOCK);
if (temp_fd >= 0) args_buf[i].o.fd = temp_fd;
args_buf[i].o.fd = temp_fd;
if (ret) if (ret)
goto out; goto out;
@ -1451,8 +1450,7 @@ static int marshal_in_tzcb_req(const struct smcinvoke_cb_txn *cb_txn,
ret = get_uhandle_from_tzhandle(tz_args[i].handle, srvr_id, ret = get_uhandle_from_tzhandle(tz_args[i].handle, srvr_id,
&temp_fd, TAKE_LOCK); &temp_fd, TAKE_LOCK);
if (temp_fd >= 0) tmp_arg.o.fd = temp_fd;
tmp_arg.o.fd = temp_fd;
if (ret) { if (ret) {
ret = -EINVAL; ret = -EINVAL;