From 04aa5af5accf79bc7ce35460005a3e30ddd4d9f1 Mon Sep 17 00:00:00 2001 From: Ohad Ben-Cohen Date: Fri, 2 Sep 2011 13:32:31 -0400 Subject: [PATCH] --- yaml --- r: 271565 b: refs/heads/master c: b4550d415a2e1668822ebf3a12b481548756b4e3 h: refs/heads/master i: 271563: 2a7dc17da0c0094a355cdc32330c9d2aa1d27dbd v: v3 --- [refs] | 2 +- trunk/drivers/iommu/omap-iommu.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f7ecddfa46dd..eceb8fb5df92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 329d8d3b474923087f6988737ff12137b58e55cc +refs/heads/master: b4550d415a2e1668822ebf3a12b481548756b4e3 diff --git a/trunk/drivers/iommu/omap-iommu.c b/trunk/drivers/iommu/omap-iommu.c index 90744afbed71..4311bc32cfa6 100644 --- a/trunk/drivers/iommu/omap-iommu.c +++ b/trunk/drivers/iommu/omap-iommu.c @@ -1069,12 +1069,10 @@ static int omap_iommu_map(struct iommu_domain *domain, unsigned long da, iotlb_init_entry(&e, da, pa, flags); ret = omap_iopgtable_store_entry(oiommu, &e); - if (ret) { + if (ret) dev_err(dev, "omap_iopgtable_store_entry failed: %d\n", ret); - return ret; - } - return 0; + return ret; } static int omap_iommu_unmap(struct iommu_domain *domain, unsigned long da,