From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Young Subject: [PATCH 7/7] efi_rtc: probe function error out in case no efi runtime enabled Date: Thu, 14 Aug 2014 17:19:13 +0800 Message-ID: <1408007953-15151-1-git-send-email-dyoung@redhat.com> References: <1408007731-15081-1-git-send-email-dyoung@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1408007731-15081-1-git-send-email-dyoung@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Matt Fleming Cc: Russ Anderson , Alessandro Zummo , Randy Dunlap , rtc-linux@googlegroups.com, Ard Biesheuvel , linux-efi@vger.kernel.org, Catalin Marinas , Daniel Kiper , Mark Salter , Will Deacon , linux-kernel@vger.kernel.org, Leif Lindholm , Ingo Molnar , hpa@zytor.com, Thomas Gleixner , linux-arm-kernel@lists.infradead.org List-Id: linux-efi@vger.kernel.org efi rtc depends on efi runtime services, so if efi runtime services are not usable it should error out. Without this patch rtc-efi will panic with 'noefi' boot Signed-off-by: Dave Young --- drivers/rtc/rtc-efi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c index c4c3843..ca2487b 100644 --- a/drivers/rtc/rtc-efi.c +++ b/drivers/rtc/rtc-efi.c @@ -191,6 +191,9 @@ static int __init efi_rtc_probe(struct platform_device *dev) { struct rtc_device *rtc; + if (!efi_enabled(EFI_RUNTIME_SERVICES)) + return -ENODEV; + rtc = devm_rtc_device_register(&dev->dev, "rtc-efi", &efi_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) -- 1.8.3.1