Commit 93665e02 authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Will Deacon
Browse files

iommu/arm-smmu: Add missing pm_runtime_disable() in qcom_iommu_device_probe 



If the probe fails, we should use pm_runtime_disable() to balance
pm_runtime_enable().
Add missing pm_runtime_disable() for error handling.

Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20220105101619.29108-1-linmq006@gmail.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent fcdeb8c3

drivers/iommu/arm/arm-smmu/qcom_iommu.c

+7 −3
Original line number Diff line number Diff line
@@ -827,20 +827,20 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) 
	ret = devm_of_platform_populate(dev);

	if (ret) {

		dev_err(dev, "Failed to populate iommu contexts\n");

		return ret;

		goto err_pm_disable;

	}



	ret = iommu_device_sysfs_add(&qcom_iommu->iommu, dev, NULL,

				     dev_name(dev));

	if (ret) {

		dev_err(dev, "Failed to register iommu in sysfs\n");

		return ret;

		goto err_pm_disable;

	}



	ret = iommu_device_register(&qcom_iommu->iommu, &qcom_iommu_ops, dev);

	if (ret) {

		dev_err(dev, "Failed to register iommu\n");

		return ret;

		goto err_pm_disable;

	}



	bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
@@ -852,6 +852,10 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) 
	}



	return 0;



err_pm_disable:

	pm_runtime_disable(dev);

	return ret;

}



static int qcom_iommu_device_remove(struct platform_device *pdev)