efi_loader: correct includes in efi_variable.c

[oweals/u-boot.git] / lib / efi_loader / efi_variable.c

diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index 4c554c546b21ca80dd6c6e8cf14f03f2f552905f..46f35bc60ba0d4cfdbeed1cf3c02758864ee4bce 100644 (file)
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -5,14 +5,12 @@
  *  Copyright (c) 2017 Rob Clark
  */
 
-#include <env.h>
-#include <malloc.h>
-#include <charset.h>
+#include <common.h>
 #include <efi_loader.h>
-#include <hexdump.h>
 #include <env_internal.h>
+#include <hexdump.h>
+#include <malloc.h>
 #include <search.h>
-#include <uuid.h>
 
 #define READ_ONLY BIT(31)
 
@@ -478,10 +476,12 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
                        old_size = 0;
                }
        } else {
-               if ((data_size == 0 &&
-                    !(attributes & EFI_VARIABLE_APPEND_WRITE)) ||
-                   !attributes) {
-                       /* delete, but nothing to do */
+               if (data_size == 0 || !attributes ||
+                   (attributes & EFI_VARIABLE_APPEND_WRITE)) {
+                       /*
+                        * Trying to delete or to update a non-existent
+                        * variable.
+                        */
                        ret = EFI_NOT_FOUND;
                        goto out;
                }