Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-block.git] / drivers / rtc / rtc-ds1685.c

diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c
index 535050fc5e9fd2fd20b60b7dc88a437afaa29bd8..1e6cfc84b1f6ce6c8daba1ec1470af5dfc95b8cf 100644 (file)
--- a/drivers/rtc/rtc-ds1685.c
+++ b/drivers/rtc/rtc-ds1685.c
@@ -187,9 +187,9 @@ ds1685_rtc_end_data_access(struct ds1685_priv *rtc)
  * Only use this where you are certain another lock will not be held.
  */
 static inline void
-ds1685_rtc_begin_ctrl_access(struct ds1685_priv *rtc, unsigned long flags)
+ds1685_rtc_begin_ctrl_access(struct ds1685_priv *rtc, unsigned long *flags)
 {
-       spin_lock_irqsave(&rtc->lock, flags);
+       spin_lock_irqsave(&rtc->lock, *flags);
        ds1685_rtc_switch_to_bank1(rtc);
 }
 
@@ -1300,7 +1300,7 @@ ds1685_rtc_sysfs_ctrl_regs_store(struct device *dev,
 {
        struct ds1685_priv *rtc = dev_get_drvdata(dev);
        u8 reg = 0, bit = 0, tmp;
-       unsigned long flags = 0;
+       unsigned long flags;
        long int val = 0;
        const struct ds1685_rtc_ctrl_regs *reg_info =
                ds1685_rtc_sysfs_ctrl_regs_lookup(attr->attr.name);
@@ -1321,7 +1321,7 @@ ds1685_rtc_sysfs_ctrl_regs_store(struct device *dev,
        bit = reg_info->bit;
 
        /* Safe to spinlock during a write. */
-       ds1685_rtc_begin_ctrl_access(rtc, flags);
+       ds1685_rtc_begin_ctrl_access(rtc, &flags);
        tmp = rtc->read(rtc, reg);
        rtc->write(rtc, reg, (val ? (tmp | bit) : (tmp & ~(bit))));
        ds1685_rtc_end_ctrl_access(rtc, flags);
@@ -2161,6 +2161,7 @@ ds1685_rtc_poweroff(struct platform_device *pdev)
        /* Check for valid RTC data, else, spin forever. */
        if (unlikely(!pdev)) {
                pr_emerg("platform device data not available, spinning forever ...\n");
+               while(1);
                unreachable();
        } else {
                /* Get the rtc data. */