1 files changed, 3 insertions, 3 deletions

diff --git a/arch/openrisc/lib/delay.c b/arch/openrisc/lib/delay.c
index 01d9740ae6f..c330767c921 100644
--- a/arch/openrisc/lib/delay.c
+++ b/arch/openrisc/lib/delay.c
@@ -30,9 +30,9 @@ int __devinit read_current_timer(unsigned long *timer_value)
 
 void __delay(unsigned long cycles)
 {
-        cycles_t target = get_cycles() + cycles;
+        cycles_t start = get_cycles();
 
-        while (get_cycles() < target)
+        while ((get_cycles() - start) < cycles)
                 cpu_relax();
 }
 EXPORT_SYMBOL(__delay);
@@ -41,7 +41,7 @@ inline void __const_udelay(unsigned long xloops)
 {
         unsigned long long loops;
 
-        loops = xloops * loops_per_jiffy * HZ;
+        loops = (unsigned long long)xloops * loops_per_jiffy * HZ;
 
         __delay(loops >> 32);
 }