summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-11-15 23:39:30 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-15 23:39:30 -0800
commitef0a4e083ca72486dbe79812bcf8a43d9b9373c5 (patch)
treee9971c272d83fda035b8321a2e423cb2990f13fd
parent4d8f3d0afa23932d90eddec7c4b8a6e3c5da4b4d (diff)
parente5f6efadcdc45c85772429572774c6514cfe8c1e (diff)
Merge "iommu/arm-smmu: Fix uninitialized use of variable error"
-rw-r--r--drivers/iommu/arm-smmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 4ed3fd177f15..eac6d07e6097 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1654,7 +1654,7 @@ static void arm_smmu_secure_domain_unlock(struct arm_smmu_domain *smmu_domain)
static unsigned long arm_smmu_pgtbl_lock(struct arm_smmu_domain *smmu_domain)
{
- unsigned long flags;
+ unsigned long flags = 0;
if (arm_smmu_is_slave_side_secure(smmu_domain))
mutex_lock(&smmu_domain->pgtbl_mutex_lock);