Commit c54451a5 authored by Vivek Gautam's avatar Vivek Gautam Committed by Will Deacon
Browse files

iommu/arm-smmu: Fix the error path in arm_smmu_add_device

fwspec->iommu_priv is available only after arm_smmu_master_cfg
instance has been allocated. We shouldn't free it before that.
Also it's logical to free the master cfg itself without
checking for fwspec.
Signed-off-by: default avatarVivek Gautam <>
[will: remove redundant assignment to fwspec]
Signed-off-by: default avatarWill Deacon <>
parent 2984f7f3
......@@ -1519,7 +1519,6 @@ static int arm_smmu_add_device(struct device *dev)
if (using_legacy_binding) {
ret = arm_smmu_register_legacy_master(dev, &smmu);
fwspec = dev->iommu_fwspec;
if (ret)
goto out_free;
} else if (fwspec && fwspec->ops == &arm_smmu_ops) {
......@@ -1558,15 +1557,15 @@ static int arm_smmu_add_device(struct device *dev)
ret = arm_smmu_master_alloc_smes(dev);
if (ret)
goto out_free;
goto out_cfg_free;
iommu_device_link(&smmu->iommu, dev);
return 0;
if (fwspec)
return ret;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment