summaryrefslogtreecommitdiff
path: root/drivers/iommu/iommu.c
diff options
context:
space:
mode:
authorZhen Lei <thunder.leizhen@huawei.com>2017-02-03 17:35:02 +0800
committerJoerg Roedel <jroedel@suse.de>2017-02-06 14:06:42 +0100
commit909111ba0ba6aa228d9b6e9cf01dd68a46586cb4 (patch)
tree4f129bfa5f167e88f6ce3971dd0d502ca63cea32 /drivers/iommu/iommu.c
parenta1831bb9403720db6d4c033fe2d6bd0116dd28fe (diff)
downloadlwn-909111ba0ba6aa228d9b6e9cf01dd68a46586cb4.tar.gz
lwn-909111ba0ba6aa228d9b6e9cf01dd68a46586cb4.zip
iommu: Avoid unnecessary assignment of dev->iommu_fwspec
Move the assignment statement into if branch above, where it only needs to be. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Reviewed-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/iommu.c')
-rw-r--r--drivers/iommu/iommu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index f4a176e56e39..428455a21ee7 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1869,13 +1869,14 @@ int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids)
fwspec = krealloc(dev->iommu_fwspec, size, GFP_KERNEL);
if (!fwspec)
return -ENOMEM;
+
+ dev->iommu_fwspec = fwspec;
}
for (i = 0; i < num_ids; i++)
fwspec->ids[fwspec->num_ids + i] = ids[i];
fwspec->num_ids += num_ids;
- dev->iommu_fwspec = fwspec;
return 0;
}
EXPORT_SYMBOL_GPL(iommu_fwspec_add_ids);