| Message ID | 20211025224159.71282-1-heinrich.schuchardt@canonical.com |
|---|---|
| State | Accepted |
| Commit | 28ab12ad145d92de13baf679c8e3733be99ee95e |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/1] env: superfluous check before free() | expand |
On Tue, Oct 26, 2021 at 12:41:59AM +0200, Heinrich Schuchardt wrote: > Free() checks if its argument in NULL. There is no need for the caller to > do the same. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Applied to u-boot/master, thanks!
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;
Free() checks if its argument in NULL. There is no need for the caller to do the same. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- env/flash.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)