diff --git a/[refs] b/[refs]
index 2def1fc84b9d..88fb5156ae2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64f1815507f207ec54ee6b9ae69c48bd153e83b4
+refs/heads/master: 3d4656d68bad84604f5b01f93e066cd02f77154b
diff --git a/trunk/arch/mips/jazz/jazzdma.c b/trunk/arch/mips/jazz/jazzdma.c
index f0fd636723be..0d64d0f46418 100644
--- a/trunk/arch/mips/jazz/jazzdma.c
+++ b/trunk/arch/mips/jazz/jazzdma.c
@@ -190,7 +190,7 @@ int vdma_free(unsigned long laddr)
 		return -1;
 	}
 
-	while (pgtbl[i].owner == laddr && i < VDMA_PGTBL_ENTRIES) {
+	while (i < VDMA_PGTBL_ENTRIES && pgtbl[i].owner == laddr) {
 		pgtbl[i].owner = VDMA_PAGE_EMPTY;
 		i++;
 	}