git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/misc' into for-linus
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
delay.h
diff --git
a/arch/powerpc/include/asm/delay.h
b/arch/powerpc/include/asm/delay.h
index
1e2eb41
..
52e4d54
100644
(file)
--- a/
arch/powerpc/include/asm/delay.h
+++ b/
arch/powerpc/include/asm/delay.h
@@
-63,6
+63,8
@@
extern void udelay(unsigned long usecs);
udelay(delay); \
else \
cpu_relax(); \
+ if (!__ret) \
+ __ret = (condition); \
__ret; \
})