diff --git a/[refs] b/[refs]
index 4be1e235c052..a95b04607a59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c963ad1d113790a8c723a178988b675868f3abe
+refs/heads/master: 88314ee73fd75eb32abdcb3119cd303c116d4500
diff --git a/trunk/arch/sparc64/kernel/pci_iommu.c b/trunk/arch/sparc64/kernel/pci_iommu.c
index 1807876f8c36..2803bc7c2c79 100644
--- a/trunk/arch/sparc64/kernel/pci_iommu.c
+++ b/trunk/arch/sparc64/kernel/pci_iommu.c
@@ -422,14 +422,12 @@ static void pci_strbuf_flush(struct pci_strbuf *strbuf, struct pci_iommu *iommu,
 		flushreg = strbuf->strbuf_ctxflush;
 		matchreg = PCI_STC_CTXMATCH_ADDR(strbuf, ctx);
 
-		if (pci_iommu_read(matchreg) == 0)
-			goto do_flush_sync;
-
 		pci_iommu_write(flushreg, ctx);
-		if ((val = pci_iommu_read(matchreg)) == 0)
+		val = pci_iommu_read(matchreg);
+		val &= 0xffff;
+		if (!val)
 			goto do_flush_sync;
 
-		val &= 0xffff;
 		while (val) {
 			if (val & 0x1)
 				pci_iommu_write(flushreg, ctx);