diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:44:54 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:44:54 +0200 |
| commit | fac778a2b8d6ca953d440baeee72901c2dd5aad9 (patch) | |
| tree | c43d780b5ff8819f4353b16c99601c5ceeeacad7 /drivers/firmware/efi/efivars.c | |
| parent | 07862c1cd6675cde2dd4bd64e64d704ea2185b79 (diff) | |
| parent | 94fc5d9de5bd757ad46f0d94bc4ebf617c4487f6 (diff) | |
Merge branch 'linus' into timers/core
Reason: Get upstream changes on which new patches depend on.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/firmware/efi/efivars.c')
| -rw-r--r-- | drivers/firmware/efi/efivars.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c index 8bd1bb6dbe47..8a7432a4b413 100644 --- a/drivers/firmware/efi/efivars.c +++ b/drivers/firmware/efi/efivars.c @@ -583,6 +583,9 @@ int efivars_sysfs_init(void) struct kobject *parent_kobj = efivars_kobject(); int error = 0; + if (!efi_enabled(EFI_RUNTIME_SERVICES)) + return -ENODEV; + /* No efivars has been registered yet */ if (!parent_kobj) return 0; |