| Message ID | 20200929014037.2436663-1-yukuai3@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e2eae09939a89e0994f7965ba3c676a5eac8b4b0 |
| Headers | show |
| Series | [V2] iommu/qcom: add missing put_device() call in qcom_iommu_of_xlate() | expand |
On Tue, 29 Sep 2020 09:40:37 +0800, Yu Kuai wrote: > if of_find_device_by_node() succeed, qcom_iommu_of_xlate() doesn't have > a corresponding put_device(). Thus add put_device() to fix the exception > handling for this function implementation. Applied to will (for-joerg/arm-smmu/updates), thanks! [1/1] iommu/qcom: add missing put_device() call in qcom_iommu_of_xlate() https://git.kernel.org/will/c/e2eae09939a8 Cheers,
diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c index 9535a6af7553..b30d6c966e2c 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -584,8 +584,10 @@ static int qcom_iommu_of_xlate(struct device *dev, struct of_phandle_args *args) * index into qcom_iommu->ctxs: */ if (WARN_ON(asid < 1) || - WARN_ON(asid > qcom_iommu->num_ctxs)) + WARN_ON(asid > qcom_iommu->num_ctxs)) { + put_device(&iommu_pdev->dev); return -EINVAL; + } if (!dev_iommu_priv_get(dev)) { dev_iommu_priv_set(dev, qcom_iommu); @@ -594,8 +596,10 @@ static int qcom_iommu_of_xlate(struct device *dev, struct of_phandle_args *args) * multiple different iommu devices. Multiple context * banks are ok, but multiple devices are not: */ - if (WARN_ON(qcom_iommu != dev_iommu_priv_get(dev))) + if (WARN_ON(qcom_iommu != dev_iommu_priv_get(dev))) { + put_device(&iommu_pdev->dev); return -EINVAL; + } } return iommu_fwspec_add_ids(dev, &asid, 1);
if of_find_device_by_node() succeed, qcom_iommu_of_xlate() doesn't have a corresponding put_device(). Thus add put_device() to fix the exception handling for this function implementation. Fixes: 0ae349a0f33fb ("iommu/qcom: Add qcom_iommu") Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- Changes in V2: - Fix wrong 'Fixes' - add missing '{}' after if drivers/iommu/arm/arm-smmu/qcom_iommu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)