diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-26 18:34:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-26 18:34:55 -0400 |
| commit | c9661d0fee0fa57b2ae2442829ed4e6b014c6296 (patch) | |
| tree | b088ee2d5955e72327db9660fdfcce1898aafc7d /env/flash.c | |
| parent | 75e33b378b3c81f1be1a8fa3815390b39fddda57 (diff) | |
| parent | 28ab12ad145d92de13baf679c8e3733be99ee95e (diff) | |
Merge branch '2021-10-26-add-nand-biterr-and-bugfixes'
- Add biterr sub-command to "nand"
- scmi, rsa, uuid bugfixes, re-sort DFU menu in Kconfig and remove
superfluous checks before free in env.
Diffstat (limited to 'env/flash.c')
| -rw-r--r-- | env/flash.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/env/flash.c b/env/flash.c index ebee9069e4..473e82454d 100644 --- a/env/flash.c +++ b/env/flash.c @@ -210,8 +210,7 @@ static int env_flash_save(void) perror: flash_perror(rc); done: - if (saved_data) - free(saved_data); + free(saved_data); /* try to re-protect */ flash_sect_protect(1, (ulong)flash_addr, end_addr); flash_sect_protect(1, (ulong)flash_addr_new, end_addr_new); @@ -298,8 +297,7 @@ static int env_flash_save(void) perror: flash_perror(rc); done: - if (saved_data) - free(saved_data); + free(saved_data); /* try to re-protect */ flash_sect_protect(1, (long)flash_addr, end_addr); return rc; |