mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 10:01:39 -05:00
iommu/omap: simplify probe_device() error handling
Simplify the probe_device() error handling by dropping the iommu OF node reference sooner. Acked-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
committed by
Joerg Roedel
parent
b587069106
commit
13e1d629d8
@@ -1668,8 +1668,8 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev)
|
||||
}
|
||||
|
||||
pdev = of_find_device_by_node(np);
|
||||
of_node_put(np);
|
||||
if (!pdev) {
|
||||
of_node_put(np);
|
||||
kfree(arch_data);
|
||||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
@@ -1677,14 +1677,11 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev)
|
||||
oiommu = platform_get_drvdata(pdev);
|
||||
put_device(&pdev->dev);
|
||||
if (!oiommu) {
|
||||
of_node_put(np);
|
||||
kfree(arch_data);
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
tmp->iommu_dev = oiommu;
|
||||
|
||||
of_node_put(np);
|
||||
}
|
||||
|
||||
dev_iommu_priv_set(dev, arch_data);
|
||||
|
||||
Reference in New Issue
Block a user