diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:27 +0100 |
| commit | 87b203079ed949de52f0d92aeae20e5e0116c12f (patch) | |
| tree | 1878756f936963822ed2d51a15db1da5814973e7 /drivers/rtc/rtc-au1xxx.c | |
| parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
| download | talos-op-linux-87b203079ed949de52f0d92aeae20e5e0116c12f.tar.gz talos-op-linux-87b203079ed949de52f0d92aeae20e5e0116c12f.zip | |
Merge branch 'x86/core' into core/percpu
Diffstat (limited to 'drivers/rtc/rtc-au1xxx.c')
| -rw-r--r-- | drivers/rtc/rtc-au1xxx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c index 8906a688e6a6..979ed0406ce9 100644 --- a/drivers/rtc/rtc-au1xxx.c +++ b/drivers/rtc/rtc-au1xxx.c @@ -81,7 +81,7 @@ static int __devinit au1xtoy_rtc_probe(struct platform_device *pdev) if (au_readl(SYS_TOYTRIM) != 32767) { /* wait until hardware gives access to TRIM register */ t = 0x00100000; - while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T0S) && t--) + while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T0S) && --t) msleep(1); if (!t) { |
