diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index e8f7bd3a5ee5dfee82dad6d4345085efbf16bf47..18445a3535cd2e390fd82b1cd05135e999afe34f 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -3782,7 +3782,9 @@ static int arm_smmu_device_remove(struct platform_device *pdev)
 {
 	struct arm_smmu_device *smmu = platform_get_drvdata(pdev);
 
-	iopf_queue_free(smmu->iopf_queue);
+	if (smmu->iopf_queue)
+		iopf_queue_free(smmu->iopf_queue);
+
 	arm_smmu_device_disable(smmu);
 
 	return 0;