diff options
| author | Varun Sethi <Varun.Sethi@freescale.com> | 2014-06-24 19:27:17 +0530 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-07-07 10:30:02 +0200 |
| commit | 3170447c1f264d51b8d1f3898bf2588588a64fdc (patch) | |
| tree | 6bba057a0f26380731f7ad191faff9c9a2edfac3 | |
| parent | 75f0e4615dc328e67634eccd86bc71597da9f8a3 (diff) | |
| download | op-kernel-dev-3170447c1f264d51b8d1f3898bf2588588a64fdc.zip op-kernel-dev-3170447c1f264d51b8d1f3898bf2588588a64fdc.tar.gz | |
iommu/fsl: Fix the error condition during iommu group
Earlier PTR_ERR was being returned even if group was set to null.
Now, we explicitly set an ERR_PTR value in case the group pointer is
NULL.
Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | drivers/iommu/fsl_pamu_domain.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c index 54060d1..af47648 100644 --- a/drivers/iommu/fsl_pamu_domain.c +++ b/drivers/iommu/fsl_pamu_domain.c @@ -1037,12 +1037,15 @@ root_bus: group = get_shared_pci_device_group(pdev); } + if (!group) + group = ERR_PTR(-ENODEV); + return group; } static int fsl_pamu_add_device(struct device *dev) { - struct iommu_group *group = NULL; + struct iommu_group *group = ERR_PTR(-ENODEV); struct pci_dev *pdev; const u32 *prop; int ret, len; @@ -1065,7 +1068,7 @@ static int fsl_pamu_add_device(struct device *dev) group = get_device_iommu_group(dev); } - if (!group || IS_ERR(group)) + if (IS_ERR(group)) return PTR_ERR(group); ret = iommu_group_add_device(group, dev); |
