1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index ca617f40574a..d6144e3b97c5 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -58,6 +58,11 @@ bool efi_runtime_disabled(void)
 
 static int __init parse_efi_cmdline(char *str)
 {
+        if (!str) {
+                pr_warn("need at least one option\n");
+                return -EINVAL;
+        }
+
         if (parse_option_str(str, "noruntime"))
                 disable_runtime = true;
 
@@ -66,7 +71,6 @@ static int __init parse_efi_cmdline(char *str)
 early_param("efi", parse_efi_cmdline);
 
 struct kobject *efi_kobj;
-static struct kobject *efivars_kobj;
 
 /*
  * Let's not leave out systab information that snuck into
@@ -218,10 +222,9 @@ static int __init efisubsys_init(void)
                 goto err_remove_group;
 
         /* and the standard mountpoint for efivarfs */
-        efivars_kobj = kobject_create_and_add("efivars", efi_kobj);
-        if (!efivars_kobj) {
+        error = sysfs_create_mount_point(efi_kobj, "efivars");
+        if (error) {
                 pr_err("efivars: Subsystem registration failed.\n");
-                error = -ENOMEM;
                 goto err_remove_group;
         }