diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
index 2de8122e218fde5856867252679b0b95682f3619..9b39901e69f0aa9ca145740c9642ad03a9db9ab8 100644
--- a/drivers/iommu/iova.c
+++ b/drivers/iommu/iova.c
@@ -71,8 +71,7 @@ static void free_iova_flush_queue(struct iova_domain *iovad)
 	if (!iovad->fq)
 		return;
 
-	if (timer_pending(&iovad->fq_timer))
-		del_timer(&iovad->fq_timer);
+	del_timer_sync(&iovad->fq_timer);
 
 	fq_destroy_all_entries(iovad);