From 8d5afc9b2d05bf349ee2e03f45c1ea1baea5241c Mon Sep 17 00:00:00 2001
From: Lars Danielsson <lars.danielsson@rt-labs.com>
Date: Wed, 10 Feb 2021 14:58:15 +0100
Subject: [PATCH] Convert bits to bytes in the correct place

---
 soes/esc_coe.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/soes/esc_coe.c b/soes/esc_coe.c
index ceb78ea..d1e4d75 100644
--- a/soes/esc_coe.c
+++ b/soes/esc_coe.c
@@ -593,7 +593,14 @@ static void SDO_upload_complete_access (void)
 
    /* loop through the subindexes to get the total size */
    uint32_t size = complete_access_subindex_loop(objd, nidx, nsub, NULL, UPLOAD, 0);
-   if (BITS2BYTES(size) > 0xffff)
+
+   /* expedited bits used calculation */
+   uint8_t dss = (size > 24) ? 0 : (4 * (3 - ((size - 1) >> 3)));
+
+   /* convert bits to bytes */
+   size = BITS2BYTES(size);
+
+   if (size > 0xffff)
    {
       /* 'size' is in this case actually an abort code */
       set_state_idle (MBXout, index, subindex, size);
@@ -606,13 +613,6 @@ static void SDO_upload_complete_access (void)
       set_state_idle (MBXout, index, subindex, ABORT_CA_NOT_SUPPORTED);
       return;
    }
-
-   /* expedited bits used calculation */
-   uint8_t dss = (size > 24) ? 0 : (4 * (3 - ((size - 1) >> 3)));
-
-   /* convert bits to bytes */
-   size = BITS2BYTES(size);
-
    abortcode = ESC_upload_pre_objecthandler(index, subindex,
          objd->data, (size_t *)&size, objd->flags | COMPLETE_ACCESS_FLAG);
    if (abortcode != 0)