diff --git a/src/trace/trace.c b/src/trace/trace.c
index c7c9af9b0b2a..9c17cf982cd8 100644
--- a/src/trace/trace.c
+++ b/src/trace/trace.c
@@ -250,11 +250,11 @@ static void vatrace_log(bool send_atomic, uint32_t log_entry, const struct tr_ct
 #if CONFIG_TRACEM
 	/* send event by mail box too. */
 	if (send_atomic) {
-		spin_lock_irq(&trace->lock, flags);
 		mtrace_event((const char *)data, MESSAGE_SIZE(arg_count));
-		spin_unlock_irq(&trace->lock, flags);
 	} else {
+		spin_lock_irq(&trace->lock, flags);
 		mtrace_event((const char *)data, MESSAGE_SIZE(arg_count));
+		spin_unlock_irq(&trace->lock, flags);
 	}
 #else
 	/* send event by mail box if level is LOG_LEVEL_CRITICAL. */
diff --git a/tools/logger/convert.c b/tools/logger/convert.c
index 5cceb70a92a5..c181b4b26012 100644
--- a/tools/logger/convert.c
+++ b/tools/logger/convert.c
@@ -457,7 +457,8 @@ static void print_entry_params(const struct log_entry_header *dma_log,
 
 	if (dma_log->timestamp < last_timestamp) {
 		fprintf(out_fd,
-			"\n\t\t --- negative DELTA: wrap, IPC_TRACE, other? ---\n\n");
+			"\n\t\t --- negative DELTA = %.3f us: wrap, IPC_TRACE, other? ---\n\n",
+			-to_usecs(last_timestamp - dma_log->timestamp));
 		entry_number = 1;
 	}
 
@@ -836,7 +837,7 @@ static int logger_read(void)
 				log_err("in %s(), fread(..., %s) failed: %s(%d)\n",
 					__func__, global_config->in_file,
 					strerror(-ret), ret);
-				return ret;
+				break;
 			}
 			/* for trace mode, try to reopen */
 			if (global_config->trace) {
@@ -851,7 +852,8 @@ static int logger_read(void)
 					log_err("in %s(), freopen(..., %s) failed: %s(%d)\n",
 						__func__, global_config->in_file,
 						strerror(errno), errno);
-					return -errno;
+					ret = -errno;
+					break;
 				}
 			} else {
 				/* EOF */