From 9e5ff5e4e67061c4d53aa7e1973bf3543b7ace3e Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 27 Nov 2022 09:01:57 +0000
Subject: util/nvmutil: move ENOTDIR check to function

---
 util/nvmutil/nvmutil.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'util/nvmutil/nvmutil.c')

diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c
index 5081a3e2..925b07e3 100644
--- a/util/nvmutil/nvmutil.c
+++ b/util/nvmutil/nvmutil.c
@@ -113,8 +113,6 @@ main(int argc, char *argv[])
 		errno = EINVAL;
 	else if (readFromFile(&fd, gbe, FILENAME, flags, SIZE_8KB) != SIZE_8KB)
 		goto nvmutil_exit;
-	else if (errno == ENOTDIR)
-		errno = 0;
 
 	if (errno != 0)
 		goto nvmutil_exit;
@@ -172,6 +170,8 @@ readFromFile(int *fd, uint8_t *buf, const char *path, int flags, size_t size)
 			return -1;
 		}
 	}
+	if (errno == ENOTDIR)
+		errno = 0;
 	return read((*fd), buf, size);
 }
 
-- 
cgit v1.2.1