2 files changed, 15 insertions, 7 deletions

diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c
index 8225b89de810..c384fec6d173 100644
--- a/drivers/rtc/rtc-efi.c
+++ b/drivers/rtc/rtc-efi.c
@@ -232,6 +232,7 @@ static struct platform_driver efi_rtc_driver = {
 
 module_platform_driver_probe(efi_rtc_driver, efi_rtc_probe);
 
+MODULE_ALIAS("platform:rtc-efi");
 MODULE_AUTHOR("dann frazier <dannf@hp.com>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("EFI RTC driver");
diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index 8f06250a0389..8754c33361e8 100644
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -717,12 +717,14 @@ static int s5m_rtc_probe(struct platform_device *pdev)
         info->device_type = s5m87xx->device_type;
         info->wtsr_smpl = s5m87xx->wtsr_smpl;
 
-        info->irq = regmap_irq_get_virq(s5m87xx->irq_data, alarm_irq);
-        if (info->irq <= 0) {
-                ret = -EINVAL;
-                dev_err(&pdev->dev, "Failed to get virtual IRQ %d\n",
+        if (s5m87xx->irq_data) {
+                info->irq = regmap_irq_get_virq(s5m87xx->irq_data, alarm_irq);
+                if (info->irq <= 0) {
+                        ret = -EINVAL;
+                        dev_err(&pdev->dev, "Failed to get virtual IRQ %d\n",
                                 alarm_irq);
-                goto err;
+                        goto err;
+                }
         }
 
         platform_set_drvdata(pdev, info);
@@ -744,6 +746,11 @@ static int s5m_rtc_probe(struct platform_device *pdev)
                 goto err;
         }
 
+        if (!info->irq) {
+                dev_info(&pdev->dev, "Alarm IRQ not available\n");
+                return 0;
+        }
+
         ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
                                         s5m_rtc_alarm_irq, 0, "rtc-alarm0",
                                         info);
@@ -802,7 +809,7 @@ static int s5m_rtc_resume(struct device *dev)
         struct s5m_rtc_info *info = dev_get_drvdata(dev);
         int ret = 0;
 
-        if (device_may_wakeup(dev))
+        if (info->irq && device_may_wakeup(dev))
                 ret = disable_irq_wake(info->irq);
 
         return ret;
@@ -813,7 +820,7 @@ static int s5m_rtc_suspend(struct device *dev)
         struct s5m_rtc_info *info = dev_get_drvdata(dev);
         int ret = 0;
 
-        if (device_may_wakeup(dev))
+        if (info->irq && device_may_wakeup(dev))
                 ret = enable_irq_wake(info->irq);
 
         return ret;