From: Yang Yingliang <yangyingliang@huawei.com>
Date: Thu, 26 Nov 2020 13:38:25 +0000 (+0800)
Subject: iommu: return error code when it can't get group
X-Git-Tag: howlett/maple_spf/20210104~295^2~7^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=058236eef606ea53ea7317afc20e9469cf3c3b91;p=users%2Fjedix%2Flinux-maple.git

iommu: return error code when it can't get group

Although iommu_group_get() in iommu_probe_device() will always succeed
thanks to __iommu_probe_device() creating the group if it's not present,
it's still worth initialising 'ret' to -ENODEV in case this path is
reachable in the future.

For now, this patch results in no functional change.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20201126133825.3643852-1-yangyingliang@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
---

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 88b0c9192d8c..dd617ed854a3 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -253,8 +253,10 @@ int iommu_probe_device(struct device *dev)
 		goto err_out;
 
 	group = iommu_group_get(dev);
-	if (!group)
+	if (!group) {
+		ret = -ENODEV;
 		goto err_release;
+	}
 
 	/*
 	 * Try to allocate a default domain - needs support from the