diff --git a/include/mraa_internal.h b/include/mraa_internal.h
index b9cb129..7d1f2e3 100644
--- a/include/mraa_internal.h
+++ b/include/mraa_internal.h
@@ -176,7 +176,7 @@ int mraa_find_i2c_bus_pci(const char* pci_device, const char *pci_id, const char
  * @param dev_name as retrieved from pci_dev_path
  * @return Result of the operation
  */
-mraa_result_t mraa_find_uart_bus_pci(const char* pci_dev_path, char** dev_name);
+mraa_result_t mraa_find_uart_bus_pci(const char* pci_dev_path, char* dev_name);
 
 #if defined(IMRAA)
 /**
diff --git a/src/mraa.c b/src/mraa.c
index b917dc4..32b10d0 100644
--- a/src/mraa.c
+++ b/src/mraa.c
@@ -289,8 +289,13 @@ mraa_deinit()
         }
 
         int i = 0;
-        // Free the UART device path
-        if ((plat->platform_type == MRAA_JSON_PLATFORM) || (plat->platform_type == MRAA_UP2)) {
+        /* Free the UART device path.  Note, some platforms dynamically
+         * allocate space for device_path, others use #defines or consts,
+         * which means this has to be handled differently per platform
+         */
+        if ((plat->platform_type == MRAA_JSON_PLATFORM) ||
+                (plat->platform_type == MRAA_UP2) ||
+                (plat->platform_type == MRAA_IEI_TANK)) {
             for (i = 0; i < plat->uart_dev_count; i++) {
                 if (plat->uart_dev[i].device_path != NULL) {
                     free(plat->uart_dev[i].device_path);
@@ -1137,7 +1142,7 @@ mraa_link_targets(const char* filename, const char* targetname)
 }
 
 mraa_result_t
-mraa_find_uart_bus_pci(const char* pci_dev_path, char** dev_name)
+mraa_find_uart_bus_pci(const char* pci_dev_path, char* dev_name)
 {
     char path[PATH_MAX];
     const int max_allowable_len = 16;
@@ -1153,14 +1158,14 @@ mraa_find_uart_bus_pci(const char* pci_dev_path, char** dev_name)
         return MRAA_ERROR_INVALID_RESOURCE;
     }
 
-    *dev_name = (char*) malloc(sizeof(char) * max_allowable_len);
+    dev_name = (char*) malloc(sizeof(char) * max_allowable_len);
 
-    snprintf(*dev_name, max_allowable_len, "/dev/%s", namelist[n - 1]->d_name);
+    snprintf(dev_name, max_allowable_len, "/dev/%s", namelist[n - 1]->d_name);
     while (n--) {
         free(namelist[n]);
     }
     free(namelist);
-    syslog(LOG_INFO, "UART device: %s selected for initialization", *dev_name);
+    syslog(LOG_INFO, "UART device: %s selected for initialization", dev_name);
     return MRAA_SUCCESS;
 }