mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-12 07:37:31 -04:00
soc: qcom: Fix smcinvoke_obj->fd assignment
Removed conditional assignment of smcinvoke_obj->fd. This handles the condition when fd created in get_uhandle_from_tzhandle is less than zero. Change-Id: I824795ba2f14bbf363d86ef21499f71d74f45537 Signed-off-by: Jiten Patel <jitepate@codeaurora.org>
This commit is contained in:
parent
7b6f9fce60
commit
fe56f2d9ab
1 changed files with 2 additions and 4 deletions
|
|
@ -1164,8 +1164,7 @@ static int marshal_out_invoke_req(const uint8_t *buf, uint32_t buf_size,
|
|||
TZHANDLE_GET_SERVER(tz_args->handle),
|
||||
&temp_fd, NO_LOCK);
|
||||
|
||||
if (temp_fd >= 0)
|
||||
args_buf[i].o.fd = temp_fd;
|
||||
args_buf[i].o.fd = temp_fd;
|
||||
|
||||
if (ret)
|
||||
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,
|
||||
&temp_fd, TAKE_LOCK);
|
||||
|
||||
if (temp_fd >= 0)
|
||||
tmp_arg.o.fd = temp_fd;
|
||||
tmp_arg.o.fd = temp_fd;
|
||||
|
||||
if (ret) {
|
||||
ret = -EINVAL;
|
||||
|
|
|
|||
Loading…
Reference in a new issue