From: Joerg Roedel <jroedel@suse.de>
Date: Wed, 28 Jun 2017 10:50:16 +0000 (+0200)
Subject: iommu/omap: Return ERR_PTR in device_group call-back
X-Git-Tag: v4.13-rc1~52^2^9~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8faf5e5a12c511410de1590cf310ec331c5ec7b1;p=thirdparty%2Fkernel%2Flinux.git

iommu/omap: Return ERR_PTR in device_group call-back

Make sure that the device_group callback returns an ERR_PTR
instead of NULL.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 95dfca36ccb99..641e035cf8666 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1309,7 +1309,7 @@ static void omap_iommu_remove_device(struct device *dev)
 static struct iommu_group *omap_iommu_device_group(struct device *dev)
 {
 	struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
-	struct iommu_group *group = NULL;
+	struct iommu_group *group = ERR_PTR(-EINVAL);
 
 	if (arch_data->iommu_dev)
 		group = arch_data->iommu_dev->group;