[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180302101050.6191-2-vivek.gautam@codeaurora.org>
Date: Fri, 2 Mar 2018 15:40:46 +0530
From: Vivek Gautam <vivek.gautam@...eaurora.org>
To: joro@...tes.org, robh+dt@...nel.org, mark.rutland@....com,
rjw@...ysocki.net, robin.murphy@....com, will.deacon@....com,
robdclark@...il.com, iommu@...ts.linux-foundation.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: tfiga@...omium.org, jcrouse@...eaurora.org, sboyd@...eaurora.org,
sricharan@...eaurora.org, m.szyprowski@...sung.com,
architt@...eaurora.org, linux-arm-msm@...r.kernel.org,
vivek.gautam@...eaurora.org
Subject: [PATCH v8 1/5] iommu/arm-smmu: Destroy domain context in failure path
If we fail after initializing domain_context, we should destroy
the context to free up resources.
Signed-off-by: Vivek Gautam <vivek.gautam@...eaurora.org>
---
* New patch added in this series.
drivers/iommu/arm-smmu.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 69e7c60792a8..ffc152c36002 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1223,11 +1223,16 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
dev_err(dev,
"cannot attach to SMMU %s whilst already attached to domain on SMMU %s\n",
dev_name(smmu_domain->smmu->dev), dev_name(smmu->dev));
- return -EINVAL;
+ ret = -EINVAL;
+ goto destroy_domain;
}
/* Looks ok, so add the device to the domain */
return arm_smmu_domain_add_master(smmu_domain, fwspec);
+
+destroy_domain:
+ arm_smmu_destroy_domain_context(domain);
+ return ret;
}
static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
Powered by blists - more mailing lists