---

yaml --- r: 329177 b: refs/heads/master c: c468bde h: refs/heads/master i: 329175: ff15ede v: v3
git-mirror · Sep 17, 2012 · 98cb82a · 98cb82a
1 parent d624922
commit 98cb82a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b82776005369899c1c7ca2e4b2414bb64b538d2c
+refs/heads/master: c468bdee28a1cb61d9b7a8ce9859d17dee43b7d7
diff --git a/trunk/drivers/xen/swiotlb-xen.c b/trunk/drivers/xen/swiotlb-xen.c
@@ -230,9 +230,10 @@ int __ref xen_swiotlb_init(int verbose, bool early)
 		goto error;
 	}
 	start_dma_addr = xen_virt_to_bus(xen_io_tlb_start);
-	if (early)
+	if (early) {
 		swiotlb_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs, verbose);
-	else
+		rc = 0;
+	} else
 		rc = swiotlb_late_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs);
 	return rc;
 error: