diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c
index 41a6b1ccc..3bab02401 100644
--- a/wolfcrypt/src/ecc.c
+++ b/wolfcrypt/src/ecc.c
@@ -9621,30 +9621,29 @@ int wc_ecc_export_ex(ecc_key* key, byte* qx, word32* qxLen,
     #endif
     #ifdef WOLFSSL_QNX_CAAM
         if (key->blackKey == CAAM_BLACK_KEY_CCM) {
-                if (*dLen < keySz + WC_CAAM_MAC_SZ) {
-                    *dLen = keySz + WC_CAAM_MAC_SZ;
-                    return BUFFER_E;
-                }
-
-                    err = wc_export_int(&key->k, d, dLen, keySz + WC_CAAM_MAC_SZ, encType);
+            if (*dLen < keySz + WC_CAAM_MAC_SZ) {
                 *dLen = keySz + WC_CAAM_MAC_SZ;
+                return BUFFER_E;
+            }
+
+            err = wc_export_int(&key->k, d, dLen, keySz + WC_CAAM_MAC_SZ,
+                encType);
+            *dLen = keySz + WC_CAAM_MAC_SZ;
         }
         else if (encType == WC_TYPE_BLACK_KEY &&
-             key->blackKey != CAAM_BLACK_KEY_ECB &&
-             key->blackKey > 0) {
-                if (*dLen < keySz + WC_CAAM_MAC_SZ) {
-                    *dLen = keySz + WC_CAAM_MAC_SZ;
-                    return BUFFER_E;
-                }
-
-                if (key->blackKey != CAAM_BLACK_KEY_CCM) {
-                    if (caamReadPartition(key->blackKey, d, keySz + WC_CAAM_MAC_SZ) != 0)
-                        return WC_HW_E;
-                }
-                else {
-                }
-
+                key->blackKey != CAAM_BLACK_KEY_ECB &&
+                key->blackKey > 0) {
+            if (*dLen < keySz + WC_CAAM_MAC_SZ) {
                 *dLen = keySz + WC_CAAM_MAC_SZ;
+                return BUFFER_E;
+            }
+
+            if (key->blackKey != CAAM_BLACK_KEY_CCM) {
+                if (caamReadPartition(key->blackKey, d, keySz + WC_CAAM_MAC_SZ) != 0)
+                    return WC_HW_E;
+            }
+
+            *dLen = keySz + WC_CAAM_MAC_SZ;
         }
         else
     #endif
diff --git a/wolfcrypt/src/port/caam/caam_driver.c b/wolfcrypt/src/port/caam/caam_driver.c
index 0566054f6..3e3a2f947 100644
--- a/wolfcrypt/src/port/caam/caam_driver.c
+++ b/wolfcrypt/src/port/caam/caam_driver.c
@@ -299,7 +299,7 @@ int caamFindUnusedPartition()
 }
 
 
-/* flag contains how the parition is set i.e CSP flag and read/write access
+/* flag contains how the partition is set i.e CSP flag and read/write access
  *      it also contains if locked
  */
 static Error caamCreatePartition(unsigned int* page, unsigned int par,
@@ -371,7 +371,7 @@ CAAM_ADDRESS caamGetPartition(unsigned int part, int partSz, unsigned int flag)
     err = caamCreatePartition(&part, part, CAAM_SM_CSP | CAAM_SM_SMAP_LOCK |
                 CAAM_SM_CSP | CAAM_SM_ALL_RW);
     if (err != Success) {
-        WOLFSSL_MSG("Error creating partiions for secure ecc key");
+        WOLFSSL_MSG("Error creating partitions for secure ecc key");
         return 0;
     }
 
@@ -529,7 +529,7 @@ int caamInitRng(struct CAAM_DEVICE* dev)
         }
 
         if (reg & (1U << 30)) {
-            WOLFSSL_MSG("JKDKEK rng was setup using a non determinstic key");
+            WOLFSSL_MSG("JKDKEK rng was setup using a non deterministic key");
             return 0;
         }