projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
iommu
/
arm-smmu.c
diff --git
a/drivers/iommu/arm-smmu.c
b/drivers/iommu/arm-smmu.c
index dce041b1c1394be7057528a5b6fd23dcbbbf6253..4cd0c29cb585000c0e5899651948ad1dc2ffbf1f 100644
(file)
--- a/
drivers/iommu/arm-smmu.c
+++ b/
drivers/iommu/arm-smmu.c
@@
-1566,7
+1566,7
@@
static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
return -ENODEV;
}
return -ENODEV;
}
- if ((id & ID0_S1TS) && ((smmu->version == 1) || (id & ID0_ATOSNS))) {
+ if ((id & ID0_S1TS) && ((smmu->version == 1) ||
!
(id & ID0_ATOSNS))) {
smmu->features |= ARM_SMMU_FEAT_TRANS_OPS;
dev_notice(smmu->dev, "\taddress translation ops\n");
}
smmu->features |= ARM_SMMU_FEAT_TRANS_OPS;
dev_notice(smmu->dev, "\taddress translation ops\n");
}