git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-omap
/
iommu.c
diff --git
a/arch/arm/plat-omap/iommu.c
b/arch/arm/plat-omap/iommu.c
index 4b6012707307f99c3fdd0995544f8ac4741c8052..94584f167a8222b1a013bf68d036afe913615daf 100644
(file)
--- a/
arch/arm/plat-omap/iommu.c
+++ b/
arch/arm/plat-omap/iommu.c
@@
-664,7
+664,7
@@
static size_t iopgtable_clear_entry_core(struct iommu *obj, u32 da)
nent = 1; /* for the next L1 entry */
} else {
bytes = IOPGD_SIZE;
- if (
*iopgd &
IOPGD_SUPER) {
+ if (
(*iopgd & IOPGD_SUPER) ==
IOPGD_SUPER) {
nent *= 16;
/* rewind to the 1st entry */
iopgd = (u32 *)((u32)iopgd & IOSUPER_MASK);