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

Commit 0bc0964b authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/arm-smmu: make a mismatch in CBs and CB interrupts non-fatal" into msm-4.8

parents 246e23e2 73230ce4

drivers/iommu/arm-smmu.c

+4 −4
Original line number Diff line number Diff line
@@ -3469,10 +3469,10 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) 
	if (smmu->version == ARM_SMMU_V2 &&

	    smmu->num_context_banks != smmu->num_context_irqs) {

		dev_err(dev,

			"found only %d context interrupt(s) but %d required\n",

			smmu->num_context_irqs, smmu->num_context_banks);

		err = -ENODEV;

		goto out_put_masters;

			"found %d context interrupt(s) but have %d context banks. assuming %d context interrupts.\n",

			smmu->num_context_irqs, smmu->num_context_banks,

			smmu->num_context_banks);

		smmu->num_context_irqs = smmu->num_context_banks;

	}



	for (i = 0; i < smmu->num_global_irqs; ++i) {