Merge "soc: qcom: Fix smcinvoke_obj->fd assignment" (2d133aad) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/soc/qcom/smcinvoke.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1164,7 +1164,6 @@ 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;

		if (ret)
		@@ -1451,7 +1450,6 @@ 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;

		if (ret) {