Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze"

[u-boot] / tools / zynqmpimage.c

diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c
index 60d8ed23b4a1ca1eda75a261e391578e931e958e..202faea07295a39efde8d5e70775aa0656917630 100644 (file)
--- a/tools/zynqmpimage.c
+++ b/tools/zynqmpimage.c
@@ -240,23 +240,19 @@ static void zynqmpimage_parse_initparams(struct zynqmp_header *zynqhdr,
        FILE *fp;
        struct zynqmp_reginit reginit;
        unsigned int reg_count = 0;
-       int r, err;
+       int r;
        struct stat path_stat;
 
+       stat(filename, &path_stat);
+       if (!S_ISREG(path_stat.st_mode))
+               return;
+
        /* Expect a table of register-value pairs, e.g. "0x12345678 0x4321" */
        fp = fopen(filename, "r");
        if (!fp) {
                fprintf(stderr, "Cannot open initparams file: %s\n", filename);
                exit(1);
        }
-
-       err = fstat(fileno(fp), &path_stat);
-       if (err)
-               return;
-
-       if (!S_ISREG(path_stat.st_mode))
-               return;
-
        do {
                r = fscanf(fp, "%x %x", &reginit.address, &reginit.data);
                if (r == 2) {