]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
xen/swiotlb: For early initialization, return zero on success.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 17 Sep 2012 14:20:09 +0000 (10:20 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 17 Sep 2012 17:00:41 +0000 (13:00 -0400)
If everything is setup properly we would return -ENOMEM since
rc by default is set to that value. Lets not do that and return
a proper return code.

Note: The reason the early code needs this special treatment
is that it SWIOTLB library call does not return anything (and
had it failed it would call panic()) - but our function does.

Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
drivers/xen/swiotlb-xen.c

index 7461edb5118eb2fabd60f8bfb3eafcb4a2acd960..b70f2d19ab990b5f541cd7ca4884675cf045c7b0 100644 (file)
@@ -230,9 +230,10 @@ retry:
                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: