diff --git a/tools/rimage/src/elf_file.c b/tools/rimage/src/elf_file.c
index c40d3a69abfb..c68a7d3af4e6 100644
--- a/tools/rimage/src/elf_file.c
+++ b/tools/rimage/src/elf_file.c
@@ -95,13 +95,13 @@ static struct name_val p_flags[] = {
  * 
  * @param elf elf file structure
  * @param msg error message
- * @param error error code to return
- * @return error code
+ * @param error positive errno value, or an already negative error code
+ * @return negative error code
  */
 static int elf_error(const struct elf_file *elf, const char *msg, int error)
 {
 	fprintf(stderr, "Error: %s: %s\n", elf->filename, msg);
-	return -error;
+	return error < 0 ? error : -error;
 }
 
 /**