2 files changed, 4 insertions, 6 deletions

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index cce1f03b8895..f75e0608be5b 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2863,6 +2863,9 @@ static unsigned device_dma_ops_init(void)
 
         for_each_pci_dev(pdev) {
                 if (!check_device(&pdev->dev)) {
+
+                        iommu_ignore_device(&pdev->dev);
+
                         unhandled += 1;
                         continue;
                 }
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 08a90b88e40d..cee307e86606 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -482,23 +482,19 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
 
         priv = domain->priv;
 
-        if (!priv) {
-                ret = -ENODEV;
+        if (!priv)
                 goto fail;
-        }
 
         fl_table = priv->pgtable;
 
         if (len != SZ_16M && len != SZ_1M &&
             len != SZ_64K && len != SZ_4K) {
                 pr_debug("Bad length: %d\n", len);
-                ret = -EINVAL;
                 goto fail;
         }
 
         if (!fl_table) {
                 pr_debug("Null page table\n");
-                ret = -EINVAL;
                 goto fail;
         }
 
@@ -507,7 +503,6 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
 
         if (*fl_pte == 0) {
                 pr_debug("First level PTE is 0\n");
-                ret = -ENODEV;
                 goto fail;
         }