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 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
iommu2.c
diff --git
a/arch/arm/mach-omap2/iommu2.c
b/arch/arm/mach-omap2/iommu2.c
index
2d9b5cc
..
4a0e1cd
100644
(file)
--- a/
arch/arm/mach-omap2/iommu2.c
+++ b/
arch/arm/mach-omap2/iommu2.c
@@
-79,7
+79,7
@@
static int omap2_iommu_enable(struct iommu *obj)
l = iommu_read_reg(obj, MMU_SYSSTATUS);
if (l & MMU_SYS_RESETDONE)
break;
- } while (time_after(jiffies, timeout));
+ } while (
!
time_after(jiffies, timeout));
if (!(l & MMU_SYS_RESETDONE)) {
dev_err(obj->dev, "can't take mmu out of reset\n");