rtc-mrst: init wakeup earlier than registering RTC device

Otherwise the RTC core won't know this is an wakeup capable RTC
device.

Signed-off-by: Yong Wang <yong.y.wang@intel.com>

diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index aed529d..1557449 100644 (file)
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -457,6 +457,9 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
        mrst_rtc.dev = dev;
        dev_set_drvdata(dev, &mrst_rtc);
 
+       /* make RTC device wake capable from sleep */
+       device_init_wakeup(dev, true);
+
        mrst_rtc.rtc = rtc_device_register(driver_name, dev,
                                &mrst_rtc_ops, THIS_MODULE);
        if (IS_ERR(mrst_rtc.rtc)) {
@@ -485,9 +488,6 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
                }
        }
 
-       /* make RTC device wake capable from sleep */
-       device_init_wakeup(dev, true);
-
        if (__intel_mid_cpu_chip == INTEL_MID_CPU_CHIP_PENWELL) {
                retval = intel_scu_ipc_command(IPCMSG_GET_HOBBASE, 0,
                                NULL, 0, &oshob_base, 1);