diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:09 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:09 +0100 |
| commit | a8a08f88cc8c2c78bcc421cd55144813b081bcec (patch) | |
| tree | 67e818ea7ce5ab531251467e13fa3ec3e18e11c7 /scripts | |
| parent | 2331b1d8e8d7aabe52b4fd65ca200cf8288aec88 (diff) | |
| parent | d0343211a27b982c3ef61597b68a6bf76df887af (diff) | |
| download | barebox-a8a08f88cc8c2c78bcc421cd55144813b081bcec.tar.gz barebox-a8a08f88cc8c2c78bcc421cd55144813b081bcec.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
common/environment.c
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kwboot.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/kwboot.c b/scripts/kwboot.c index 81da3e81bc..e06866052b 100644 --- a/scripts/kwboot.c +++ b/scripts/kwboot.c @@ -552,7 +552,6 @@ kwboot_mmap_image(const char *path, size_t *size, int prot) void *img; rc = -1; - fd = -1; img = NULL; fd = open(path, O_RDONLY); |