Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 084ac4b0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: arm-smmu: use bitwise operator instead of logical"

parents 3b569fc4 ad9f9a55

drivers/iommu/arm-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ static void parse_driver_options(struct arm_smmu_device *smmu) 
	} while (arm_smmu_options[++i].opt);



	if (arm_smmu_opt_hibernation(smmu) &&

	    smmu->options && ARM_SMMU_OPT_SKIP_INIT) {

	    (smmu->options & ARM_SMMU_OPT_SKIP_INIT)) {

		dev_info(smmu->dev,

			 "Disabling incompatible option: skip-init\n");

		smmu->options &= ~ARM_SMMU_OPT_SKIP_INIT;