From 98cb82a3c3b9263ae06d82638e0754a57e9014a9 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Mon, 17 Sep 2012 10:20:09 -0400 Subject: [PATCH] --- yaml --- r: 329177 b: refs/heads/master c: c468bdee28a1cb61d9b7a8ce9859d17dee43b7d7 h: refs/heads/master i: 329175: ff15edef86fd6202c8242c4b7e6a190cecc6e57b v: v3 --- [refs] | 2 +- trunk/drivers/xen/swiotlb-xen.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d5ac07a97a45..9d8666c08a61 100644 --- 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 index 7461edb5118e..b70f2d19ab99 100644 --- 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: