diff options
| author | Alex Frid <afrid@nvidia.com> | 2011-05-05 14:32:58 -0700 |
|---|---|---|
| committer | Niket Sirsi <nsirsi@nvidia.com> | 2011-05-06 19:52:40 -0700 |
| commit | ee8b3db807070f3a3018e455a458c213db7c9435 (patch) | |
| tree | a0636bd39517bf39a4aba5d70505879e36ff4aec /arch/arm/mach-tegra/power-macros.S | |
| parent | 423d4a1b74f3b48771d08e48445977c0544e00e6 (diff) | |
ARM: tegra: Fix wait_util race/very long wait.
Change-Id: I782ca4ffc94175e5e73535fbb0309173a72a83d5
Reviewed-on: http://git-master/r/30582
Tested-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Jin Qian <jqian@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/power-macros.S')
| -rw-r--r-- | arch/arm/mach-tegra/power-macros.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/power-macros.S b/arch/arm/mach-tegra/power-macros.S index 35a8210628a4..cac6e9b22acd 100644 --- a/arch/arm/mach-tegra/power-macros.S +++ b/arch/arm/mach-tegra/power-macros.S @@ -43,8 +43,8 @@ /* waits until the microsecond counter (base) is > rn */ .macro wait_until, rn, base, tmp -1002: ldr \tmp, [\base] add \rn, \rn, #1 +1002: ldr \tmp, [\base] sub \tmp, \tmp, \rn ands \tmp, \tmp, #0x80000000 dmb |