diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-16 20:23:44 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-16 20:23:44 +0200 |
commit | e741110f5a4089f22dbaae97443753acd4851bdd (patch) | |
tree | 86acf2e6c390d633da5be4a4ea4e1c6d024c4bec /common/uimage.c | |
parent | 9115339720c3df3c9b40dae7adbef137362efcc0 (diff) | |
parent | 0d188aca536284f3c9650d8857c43c0dd5a81c2c (diff) | |
download | barebox-e741110f5a4089f22dbaae97443753acd4851bdd.tar.gz barebox-e741110f5a4089f22dbaae97443753acd4851bdd.tar.xz |
Merge branch 'master' into next
Diffstat (limited to 'common/uimage.c')
-rw-r--r-- | common/uimage.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/uimage.c b/common/uimage.c index 4933c40583..945f3d6b0f 100644 --- a/common/uimage.c +++ b/common/uimage.c @@ -404,8 +404,12 @@ struct resource *file_to_sdram(const char *filename, unsigned long adr) res = NULL; goto out; } - if (now < BUFSIZ) + + if (now < BUFSIZ) { + release_sdram_region(res); + res = request_sdram_region("image", adr, ofs + now); goto out; + } release_sdram_region(res); |