diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index ad564ca4b1db..6e0350aadcbd 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -4833,6 +4833,7 @@ static int arm_smmu_device_remove(struct platform_device *pdev)
 		dev_err(&pdev->dev, "removing device with active domains!\n");
 
 	arm_smmu_bus_init(NULL);
+	iommu_device_unregister(&smmu->iommu);
 	idr_destroy(&smmu->asid_idr);
 
 	/* Turn the thing off */