From: Peng Fan <peng.fan@nxp.com>
Date: Fri, 21 Apr 2017 09:03:36 +0000 (+0800)
Subject: iommu/arm-smmu: Correct sid to mask
X-Git-Tag: v4.12-rc1~50^2^5~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6323f474902e372623d73486c1ad30eb40d6604f;p=thirdparty%2Fkernel%2Flinux.git

iommu/arm-smmu: Correct sid to mask

From code "SMR mask 0x%x out of range for SMMU", so, we need to use mask, not
sid.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index dbd4998661c6f..77242afa1efcd 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1535,7 +1535,7 @@ static int arm_smmu_add_device(struct device *dev)
 		}
 		if (mask & ~smmu->smr_mask_mask) {
 			dev_err(dev, "SMR mask 0x%x out of range for SMMU (0x%x)\n",
-				sid, smmu->smr_mask_mask);
+				mask, smmu->smr_mask_mask);
 			goto out_free;
 		}
 	}