1 files changed, 18 insertions, 1 deletions

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index be5a6b73e601..9583cbcc6b79 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -15,6 +15,8 @@
 #include <linux/rtc.h>
 #include <linux/kdev_t.h>
 #include <linux/idr.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
 
 #include "rtc-core.h"
 
@@ -151,14 +153,28 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
         spin_lock_init(&rtc->irq_task_lock);
         init_waitqueue_head(&rtc->irq_queue);
 
+        /* Init timerqueue */
+        timerqueue_init_head(&rtc->timerqueue);
+        INIT_WORK(&rtc->irqwork, rtc_timer_do_work);
+        /* Init aie timer */
+        rtc_timer_init(&rtc->aie_timer, rtc_aie_update_irq, (void *)rtc);
+        /* Init uie timer */
+        rtc_timer_init(&rtc->uie_rtctimer, rtc_uie_update_irq, (void *)rtc);
+        /* Init pie timer */
+        hrtimer_init(&rtc->pie_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+        rtc->pie_timer.function = rtc_pie_update_irq;
+        rtc->pie_enabled = 0;
+
         strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
         dev_set_name(&rtc->dev, "rtc%d", id);
 
         rtc_dev_prepare(rtc);
 
         err = device_register(&rtc->dev);
-        if (err)
+        if (err) {
+                put_device(&rtc->dev);
                 goto exit_kfree;
+        }
 
         rtc_dev_add_device(rtc);
         rtc_sysfs_add_device(rtc);
@@ -226,6 +242,7 @@ static void __exit rtc_exit(void)
 {
         rtc_dev_exit();
         class_destroy(rtc_class);
+        idr_destroy(&rtc_idr);
 }
 
 subsys_initcall(rtc_init);