1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c
index f0a43646a2f3..1fa724f31b0e 100644
--- a/drivers/firmware/efi/vars.c
+++ b/drivers/firmware/efi/vars.c
@@ -321,11 +321,11 @@ static unsigned long var_name_strnsize(efi_char16_t *variable_name,
  * Print a warning when duplicate EFI variables are encountered and
  * disable the sysfs workqueue since the firmware is buggy.
  */
-static void dup_variable_bug(efi_char16_t *s16, efi_guid_t *vendor_guid,
+static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid,
                              unsigned long len16)
 {
         size_t i, len8 = len16 / sizeof(efi_char16_t);
-        char *s8;
+        char *str8;
 
         /*
          * Disable the workqueue since the algorithm it uses for
@@ -334,16 +334,16 @@ static void dup_variable_bug(efi_char16_t *s16, efi_guid_t *vendor_guid,
          */
         efivar_wq_enabled = false;
 
-        s8 = kzalloc(len8, GFP_KERNEL);
-        if (!s8)
+        str8 = kzalloc(len8, GFP_KERNEL);
+        if (!str8)
                 return;
 
         for (i = 0; i < len8; i++)
-                s8[i] = s16[i];
+                str8[i] = str16[i];
 
         printk(KERN_WARNING "efivars: duplicate variable: %s-%pUl\n",
-               s8, vendor_guid);
-        kfree(s8);
+               str8, vendor_guid);
+        kfree(str8);
 }
 
 /**