Merge "iommu/arm-smmu: Fix uninitialized use of variable error"

This commit is contained in:
Linux Build Service Account 2016-11-15 23:39:30 -08:00 committed by Gerrit - the friendly Code Review server
commit ef0a4e083c

View file

@ -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) 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)) if (arm_smmu_is_slave_side_secure(smmu_domain))
mutex_lock(&smmu_domain->pgtbl_mutex_lock); mutex_lock(&smmu_domain->pgtbl_mutex_lock);