12 files changed, 50 insertions, 29 deletions

diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c
index 8d46838dff8a..755e1fe914af 100644
--- a/drivers/rtc/rtc-davinci.c
+++ b/drivers/rtc/rtc-davinci.c
@@ -524,6 +524,8 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
                 goto fail2;
         }
 
+        platform_set_drvdata(pdev, davinci_rtc);
+
         davinci_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
                                     &davinci_rtc_ops, THIS_MODULE);
         if (IS_ERR(davinci_rtc->rtc)) {
@@ -553,8 +555,6 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
 
         rtcss_write(davinci_rtc, PRTCSS_RTC_CCTRL_CAEN, PRTCSS_RTC_CCTRL);
 
-        platform_set_drvdata(pdev, davinci_rtc);
-
         device_init_wakeup(&pdev->dev, 0);
 
         return 0;
@@ -562,6 +562,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
 fail4:
         rtc_device_unregister(davinci_rtc->rtc);
 fail3:
+        platform_set_drvdata(pdev, NULL);
         iounmap(davinci_rtc->base);
 fail2:
         release_mem_region(davinci_rtc->pbase, davinci_rtc->base_size);
diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c
index 60ce69600828..47e681df31e2 100644
--- a/drivers/rtc/rtc-ds1286.c
+++ b/drivers/rtc/rtc-ds1286.c
@@ -355,6 +355,7 @@ static int __devinit ds1286_probe(struct platform_device *pdev)
                 goto out;
         }
         spin_lock_init(&priv->lock);
+        platform_set_drvdata(pdev, priv);
         rtc = rtc_device_register("ds1286", &pdev->dev,
                                   &ds1286_ops, THIS_MODULE);
         if (IS_ERR(rtc)) {
@@ -362,7 +363,6 @@ static int __devinit ds1286_probe(struct platform_device *pdev)
                 goto out;
         }
         priv->rtc = rtc;
-        platform_set_drvdata(pdev, priv);
         return 0;
 
 out:
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index 11ae64dcbf3c..335551d333b2 100644
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -151,6 +151,7 @@ static int __init ep93xx_rtc_probe(struct platform_device *pdev)
                 return -ENXIO;
 
         pdev->dev.platform_data = ep93xx_rtc;
+        platform_set_drvdata(pdev, rtc);
 
         rtc = rtc_device_register(pdev->name,
                                 &pdev->dev, &ep93xx_rtc_ops, THIS_MODULE);
@@ -159,8 +160,6 @@ static int __init ep93xx_rtc_probe(struct platform_device *pdev)
                 goto exit;
         }
 
-        platform_set_drvdata(pdev, rtc);
-
         err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
         if (err)
                 goto fail;
@@ -168,9 +167,9 @@ static int __init ep93xx_rtc_probe(struct platform_device *pdev)
         return 0;
 
 fail:
-        platform_set_drvdata(pdev, NULL);
         rtc_device_unregister(rtc);
 exit:
+        platform_set_drvdata(pdev, NULL);
         pdev->dev.platform_data = NULL;
         return err;
 }
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 69fe664a2228..eda128fc1d38 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -783,6 +783,9 @@ static int m41t80_probe(struct i2c_client *client,
                 goto exit;
         }
 
+        clientdata->features = id->driver_data;
+        i2c_set_clientdata(client, clientdata);
+
         rtc = rtc_device_register(client->name, &client->dev,
                                   &m41t80_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc)) {
@@ -792,8 +795,6 @@ static int m41t80_probe(struct i2c_client *client,
         }
 
         clientdata->rtc = rtc;
-        clientdata->features = id->driver_data;
-        i2c_set_clientdata(client, clientdata);
 
         /* Make sure HT (Halt Update) bit is cleared */
         rc = i2c_smbus_read_byte_data(client, M41T80_REG_ALARM_HOUR);
diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c
index 20494b5edc3c..3bc046f427e0 100644
--- a/drivers/rtc/rtc-max8925.c
+++ b/drivers/rtc/rtc-max8925.c
@@ -258,6 +258,8 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev)
         }
 
         dev_set_drvdata(&pdev->dev, info);
+        /* XXX - isn't this redundant? */
+        platform_set_drvdata(pdev, info);
 
         info->rtc_dev = rtc_device_register("max8925-rtc", &pdev->dev,
                                         &max8925_rtc_ops, THIS_MODULE);
@@ -267,10 +269,9 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev)
                 goto out_rtc;
         }
 
-        platform_set_drvdata(pdev, info);
-
         return 0;
 out_rtc:
+        platform_set_drvdata(pdev, NULL);
         free_irq(chip->irq_base + MAX8925_IRQ_RTC_ALARM0, info);
 out_irq:
         kfree(info);
diff --git a/drivers/rtc/rtc-max8998.c b/drivers/rtc/rtc-max8998.c
index 3f7bc6b9fefa..2e48aa604273 100644
--- a/drivers/rtc/rtc-max8998.c
+++ b/drivers/rtc/rtc-max8998.c
@@ -265,6 +265,8 @@ static int __devinit max8998_rtc_probe(struct platform_device *pdev)
         info->rtc = max8998->rtc;
         info->irq = max8998->irq_base + MAX8998_IRQ_ALARM0;
 
+        platform_set_drvdata(pdev, info);
+
         info->rtc_dev = rtc_device_register("max8998-rtc", &pdev->dev,
                         &max8998_rtc_ops, THIS_MODULE);
 
@@ -274,8 +276,6 @@ static int __devinit max8998_rtc_probe(struct platform_device *pdev)
                 goto out_rtc;
         }
 
-        platform_set_drvdata(pdev, info);
-
         ret = request_threaded_irq(info->irq, NULL, max8998_rtc_alarm_irq, 0,
                         "rtc-alarm0", info);
 
@@ -293,6 +293,7 @@ static int __devinit max8998_rtc_probe(struct platform_device *pdev)
         return 0;
 
 out_rtc:
+        platform_set_drvdata(pdev, NULL);
         kfree(info);
         return ret;
 }
diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
index c5ac03793e79..a1a278bc340d 100644
--- a/drivers/rtc/rtc-mc13xxx.c
+++ b/drivers/rtc/rtc-mc13xxx.c
@@ -349,11 +349,15 @@ static int __devinit mc13xxx_rtc_probe(struct platform_device *pdev)
         if (ret)
                 goto err_alarm_irq_request;
 
+        mc13xxx_unlock(mc13xxx);
+
         priv->rtc = rtc_device_register(pdev->name,
                         &pdev->dev, &mc13xxx_rtc_ops, THIS_MODULE);
         if (IS_ERR(priv->rtc)) {
                 ret = PTR_ERR(priv->rtc);
 
+                mc13xxx_lock(mc13xxx);
+
                 mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_TODA, priv);
 err_alarm_irq_request:
 
@@ -365,12 +369,12 @@ err_reset_irq_status:
                 mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_RTCRST, priv);
 err_reset_irq_request:
 
+                mc13xxx_unlock(mc13xxx);
+
                 platform_set_drvdata(pdev, NULL);
                 kfree(priv);
         }
 
-        mc13xxx_unlock(mc13xxx);
-
         return ret;
 }
 
diff --git a/drivers/rtc/rtc-msm6242.c b/drivers/rtc/rtc-msm6242.c
index 67820626e18f..fcb113c11122 100644
--- a/drivers/rtc/rtc-msm6242.c
+++ b/drivers/rtc/rtc-msm6242.c
@@ -214,6 +214,7 @@ static int __init msm6242_rtc_probe(struct platform_device *dev)
                 error = -ENOMEM;
                 goto out_free_priv;
         }
+        platform_set_drvdata(dev, priv);
 
         rtc = rtc_device_register("rtc-msm6242", &dev->dev, &msm6242_rtc_ops,
                                   THIS_MODULE);
@@ -223,10 +224,10 @@ static int __init msm6242_rtc_probe(struct platform_device *dev)
         }
 
         priv->rtc = rtc;
-        platform_set_drvdata(dev, priv);
         return 0;
 
 out_unmap:
+        platform_set_drvdata(dev, NULL);
         iounmap(priv->regs);
 out_free_priv:
         kfree(priv);
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
index 826ab64a8fa9..d814417bee8c 100644
--- a/drivers/rtc/rtc-mxc.c
+++ b/drivers/rtc/rtc-mxc.c
@@ -418,14 +418,6 @@ static int __init mxc_rtc_probe(struct platform_device *pdev)
                 goto exit_put_clk;
         }
 
-        rtc = rtc_device_register(pdev->name, &pdev->dev, &mxc_rtc_ops,
-                                  THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                ret = PTR_ERR(rtc);
-                goto exit_put_clk;
-        }
-
-        pdata->rtc = rtc;
         platform_set_drvdata(pdev, pdata);
 
         /* Configure and enable the RTC */
@@ -438,8 +430,19 @@ static int __init mxc_rtc_probe(struct platform_device *pdev)
                 pdata->irq = -1;
         }
 
+        rtc = rtc_device_register(pdev->name, &pdev->dev, &mxc_rtc_ops,
+                                  THIS_MODULE);
+        if (IS_ERR(rtc)) {
+                ret = PTR_ERR(rtc);
+                goto exit_clr_drvdata;
+        }
+
+        pdata->rtc = rtc;
+
         return 0;
 
+exit_clr_drvdata:
+        platform_set_drvdata(pdev, NULL);
 exit_put_clk:
         clk_disable(pdata->clk);
         clk_put(pdata->clk);
diff --git a/drivers/rtc/rtc-pcap.c b/drivers/rtc/rtc-pcap.c
index a633abc42896..cd4f198cc2ef 100644
--- a/drivers/rtc/rtc-pcap.c
+++ b/drivers/rtc/rtc-pcap.c
@@ -151,6 +151,8 @@ static int __devinit pcap_rtc_probe(struct platform_device *pdev)
 
         pcap_rtc->pcap = dev_get_drvdata(pdev->dev.parent);
 
+        platform_set_drvdata(pdev, pcap_rtc);
+
         pcap_rtc->rtc = rtc_device_register("pcap", &pdev->dev,
                                   &pcap_rtc_ops, THIS_MODULE);
         if (IS_ERR(pcap_rtc->rtc)) {
@@ -158,7 +160,6 @@ static int __devinit pcap_rtc_probe(struct platform_device *pdev)
                 goto fail_rtc;
         }
 
-        platform_set_drvdata(pdev, pcap_rtc);
 
         timer_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_1HZ);
         alarm_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_TODA);
@@ -177,6 +178,7 @@ fail_alarm:
 fail_timer:
         rtc_device_unregister(pcap_rtc->rtc);
 fail_rtc:
+        platform_set_drvdata(pdev, NULL);
         kfree(pcap_rtc);
         return err;
 }
diff --git a/drivers/rtc/rtc-rp5c01.c b/drivers/rtc/rtc-rp5c01.c
index 694da39b6dd2..359da6d020b9 100644
--- a/drivers/rtc/rtc-rp5c01.c
+++ b/drivers/rtc/rtc-rp5c01.c
@@ -249,15 +249,15 @@ static int __init rp5c01_rtc_probe(struct platform_device *dev)
 
         spin_lock_init(&priv->lock);
 
+        platform_set_drvdata(dev, priv);
+
         rtc = rtc_device_register("rtc-rp5c01", &dev->dev, &rp5c01_rtc_ops,
                                   THIS_MODULE);
         if (IS_ERR(rtc)) {
                 error = PTR_ERR(rtc);
                 goto out_unmap;
         }
-
         priv->rtc = rtc;
-        platform_set_drvdata(dev, priv);
 
         error = sysfs_create_bin_file(&dev->dev.kobj, &priv->nvram_attr);
         if (error)
@@ -268,6 +268,7 @@ static int __init rp5c01_rtc_probe(struct platform_device *dev)
 out_unregister:
         rtc_device_unregister(rtc);
 out_unmap:
+        platform_set_drvdata(dev, NULL);
         iounmap(priv->regs);
 out_free_priv:
         kfree(priv);
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index b3466c491cd3..16512ecae31a 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -46,6 +46,7 @@ static struct clk *rtc_clk;
 static void __iomem *s3c_rtc_base;
 static int s3c_rtc_alarmno = NO_IRQ;
 static int s3c_rtc_tickno  = NO_IRQ;
+static bool wake_en;
 static enum s3c_cpu_type s3c_rtc_cpu_type;
 
 static DEFINE_SPINLOCK(s3c_rtc_pie_lock);
@@ -562,8 +563,12 @@ static int s3c_rtc_suspend(struct platform_device *pdev, pm_message_t state)
         }
         s3c_rtc_enable(pdev, 0);
 
-        if (device_may_wakeup(&pdev->dev))
-                enable_irq_wake(s3c_rtc_alarmno);
+        if (device_may_wakeup(&pdev->dev) && !wake_en) {
+                if (enable_irq_wake(s3c_rtc_alarmno) == 0)
+                        wake_en = true;
+                else
+                        dev_err(&pdev->dev, "enable_irq_wake failed\n");
+        }
 
         return 0;
 }
@@ -579,8 +584,10 @@ static int s3c_rtc_resume(struct platform_device *pdev)
                 writew(tmp | ticnt_en_save, s3c_rtc_base + S3C2410_RTCCON);
         }
 
-        if (device_may_wakeup(&pdev->dev))
+        if (device_may_wakeup(&pdev->dev) && wake_en) {
                 disable_irq_wake(s3c_rtc_alarmno);
+                wake_en = false;
+        }
 
         return 0;
 }