Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-block.git] / drivers / firmware / efi / efi.c

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index cfa6fe786ab61555b52b65efc61528f468630011..cd42f66a7c85a70801b2322ded2359fc22859ca6 100644 (file)
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -612,7 +612,7 @@ static int __init efi_load_efivars(void)
                return 0;
 
        pdev = platform_device_register_simple("efivars", 0, NULL, 0);
-       return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;
+       return PTR_ERR_OR_ZERO(pdev);
 }
 device_initcall(efi_load_efivars);
 #endif