Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

env_sf: re-order error handling in single-buffer env_relocate_spec

Browse source 
this makes it easier comparable to the double-buffered version

Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Tested-by: Jagan Teki <jagan@openedev.com>
This commit is contained in:
Andreas Fenkart 2017-04-08 11:59:33 +02:00 committed by Jagan Teki
parent 8fee8845e7
commit c041c60c6c
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/env_sf.c
View file

@ -313,29 +313,31 @@ void env_relocate_spec(void)
char *buf = NULL;
buf = (char *)memalign(ARCH_DMA_MINALIGN, CONFIG_ENV_SIZE);
ret = setup_flash_device();
if (ret) {
if (buf)
free(buf);
if (!buf) {
set_default_env("!malloc() failed");
return;
}
ret = setup_flash_device();
if (ret)
goto out;
ret = spi_flash_read(env_flash,
CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, buf);
if (ret) {
set_default_env("!spi_flash_read() failed");
goto out;
goto err_read;
}
ret = env_import(buf, 1);
if (ret)
gd->env_valid = 1;
out:
err_read:
spi_flash_free(env_flash);
if (buf)
free(buf);
env_flash = NULL;
out:
free(buf);
}
#endif