selinuxfs: merge dentry allocation into sel_make_dir()

[mv-sheeva.git] / drivers / rtc / rtc-max8925.c

diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c
index 4a5529346b47465528e1cddcce6bb9007d0ff4bd..1459055a83aaad94a522f093b045bad2a9812b6b 100644 (file)
--- a/drivers/rtc/rtc-max8925.c
+++ b/drivers/rtc/rtc-max8925.c
@@ -193,10 +193,17 @@ static int max8925_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
        ret = max8925_reg_read(info->rtc, MAX8925_RTC_IRQ_MASK);
        if (ret < 0)
                goto out;
-       if ((ret & ALARM0_IRQ) == 0)
-               alrm->enabled = 1;
-       else
+       if (ret & ALARM0_IRQ) {
                alrm->enabled = 0;
+       } else {
+               ret = max8925_reg_read(info->rtc, MAX8925_ALARM0_CNTL);
+               if (ret < 0)
+                       goto out;
+               if (!ret)
+                       alrm->enabled = 0;
+               else
+                       alrm->enabled = 1;
+       }
        ret = max8925_reg_read(info->rtc, MAX8925_RTC_STATUS);
        if (ret < 0)
                goto out;
@@ -204,6 +211,7 @@ static int max8925_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
                alrm->pending = 1;
        else
                alrm->pending = 0;
+       return 0;
 out:
        return ret;
 }
@@ -220,8 +228,11 @@ static int max8925_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
        ret = max8925_bulk_write(info->rtc, MAX8925_ALARM0_SEC, TIME_NUM, buf);
        if (ret < 0)
                goto out;
-       /* only enable alarm on year/month/day/hour/min/sec */
-       ret = max8925_reg_write(info->rtc, MAX8925_ALARM0_CNTL, 0x77);
+       if (alrm->enabled)
+               /* only enable alarm on year/month/day/hour/min/sec */
+               ret = max8925_reg_write(info->rtc, MAX8925_ALARM0_CNTL, 0x77);
+       else
+               ret = max8925_reg_write(info->rtc, MAX8925_ALARM0_CNTL, 0x0);
        if (ret < 0)
                goto out;
 out:
@@ -261,6 +272,8 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev)
        /* XXX - isn't this redundant? */
        platform_set_drvdata(pdev, info);
 
+       device_init_wakeup(&pdev->dev, 1);
+
        info->rtc_dev = rtc_device_register("max8925-rtc", &pdev->dev,
                                        &max8925_rtc_ops, THIS_MODULE);
        ret = PTR_ERR(info->rtc_dev);
@@ -290,10 +303,34 @@ static int __devexit max8925_rtc_remove(struct platform_device *pdev)
        return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int max8925_rtc_suspend(struct device *dev)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
+
+       if (device_may_wakeup(dev))
+               chip->wakeup_flag |= 1 << MAX8925_IRQ_RTC_ALARM0;
+       return 0;
+}
+static int max8925_rtc_resume(struct device *dev)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
+
+       if (device_may_wakeup(dev))
+               chip->wakeup_flag &= ~(1 << MAX8925_IRQ_RTC_ALARM0);
+       return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(max8925_rtc_pm_ops, max8925_rtc_suspend, max8925_rtc_resume);
+
 static struct platform_driver max8925_rtc_driver = {
        .driver         = {
                .name   = "max8925-rtc",
                .owner  = THIS_MODULE,
+               .pm     = &max8925_rtc_pm_ops,
        },
        .probe          = max8925_rtc_probe,
        .remove         = __devexit_p(max8925_rtc_remove),