Merge tag 'trace-v4.14-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...

[linux-2.6-microblaze.git] / scripts / dtc / dtc.c

diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c
index a4edf4c..f5eed9d 100644 (file)
--- a/scripts/dtc/dtc.c
+++ b/scripts/dtc/dtc.c
@@ -138,7 +138,7 @@ static const char *guess_type_by_name(const char *fname, const char *fallback)
 static const char *guess_input_format(const char *fname, const char *fallback)
 {
        struct stat statbuf;
-       uint32_t magic;
+       fdt32_t magic;
        FILE *f;
 
        if (stat(fname, &statbuf) != 0)
@@ -159,8 +159,7 @@ static const char *guess_input_format(const char *fname, const char *fallback)
        }
        fclose(f);
 
-       magic = fdt32_to_cpu(magic);
-       if (magic == FDT_MAGIC)
+       if (fdt32_to_cpu(magic) == FDT_MAGIC)
                return "dtb";
 
        return guess_type_by_name(fname, fallback);
@@ -216,7 +215,7 @@ int main(int argc, char *argv[])
                        alignsize = strtol(optarg, NULL, 0);
                        if (!is_power_of_2(alignsize))
                                die("Invalid argument \"%d\" to -a option\n",
-                                   optarg);
+                                   alignsize);
                        break;
                case 'f':
                        force = true;
@@ -309,6 +308,8 @@ int main(int argc, char *argv[])
        else
                die("Unknown input format \"%s\"\n", inform);
 
+       dti->outname = outname;
+
        if (depfile) {
                fputc('\n', depfile);
                fclose(depfile);