diff options
| author | Vivek Gautam <vivek.gautam@codeaurora.org> | 2017-07-06 11:37:00 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-07-20 11:30:28 +0200 |
| commit | c54451a5e2415948274bc71f469e5349469addcc (patch) | |
| tree | 0318cee60c8394a7bb616d58f8a21034fd580eda /drivers/iommu/arm-smmu.c | |
| parent | Revert "iommu/io-pgtable: Avoid redundant TLB syncs" (diff) | |
| download | linux-c54451a5e2415948274bc71f469e5349469addcc.tar.xz linux-c54451a5e2415948274bc71f469e5349469addcc.zip | |
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: Vivek Gautam <vivek.gautam@codeaurora.org>
[will: remove redundant assignment to fwspec]
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu/arm-smmu.c')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 98ff462b5992..b97188acc4f1 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -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; +out_cfg_free: + kfree(cfg); out_free: - if (fwspec) - kfree(fwspec->iommu_priv); iommu_fwspec_free(dev); return ret; } |