Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c
index 4c5d5d0c4cfc..16edf94ab42f 100644
--- a/drivers/rtc/rtc-pcf50633.c
+++ b/drivers/rtc/rtc-pcf50633.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
 #include <linux/bcd.h>
@@ -58,6 +59,7 @@ struct pcf50633_time {
 struct pcf50633_rtc {
         int alarm_enabled;
         int second_enabled;
+        int alarm_pending;
 
         struct pcf50633 *pcf;
         struct rtc_device *rtc_dev;
@@ -209,6 +211,7 @@ static int pcf50633_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         rtc = dev_get_drvdata(dev);
 
         alrm->enabled = rtc->alarm_enabled;
+        alrm->pending = rtc->alarm_pending;
 
         ret = pcf50633_read_block(rtc->pcf, PCF50633_REG_RTCSCA,
                                 PCF50633_TI_EXTENT, &pcf_tm.time[0]);
@@ -244,6 +247,8 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         /* Returns 0 on success */
         ret = pcf50633_write_block(rtc->pcf, PCF50633_REG_RTCSCA,
                                 PCF50633_TI_EXTENT, &pcf_tm.time[0]);
+        if (!alrm->enabled)
+                rtc->alarm_pending = 0;
 
         if (!alarm_masked || alrm->enabled)
                 pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
@@ -268,6 +273,7 @@ static void pcf50633_rtc_irq(int irq, void *data)
         switch (irq) {
         case PCF50633_IRQ_ALARM:
                 rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
+                rtc->alarm_pending = 1;
                 break;
         case PCF50633_IRQ_SECOND:
                 rtc_update_irq(rtc->rtc_dev, 1, RTC_UF | RTC_IRQF);
@@ -277,16 +283,13 @@ static void pcf50633_rtc_irq(int irq, void *data)
 
 static int __devinit pcf50633_rtc_probe(struct platform_device *pdev)
 {
-        struct pcf50633_subdev_pdata *pdata;
         struct pcf50633_rtc *rtc;
 
-
         rtc = kzalloc(sizeof(*rtc), GFP_KERNEL);
         if (!rtc)
                 return -ENOMEM;
 
-        pdata = pdev->dev.platform_data;
-        rtc->pcf = pdata->pcf;
+        rtc->pcf = dev_to_pcf50633(pdev->dev.parent);
         platform_set_drvdata(pdev, rtc);
         rtc->rtc_dev = rtc_device_register("pcf50633-rtc", &pdev->dev,
                                 &pcf50633_rtc_ops, THIS_MODULE);