1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 657873e4328d..d7aa39e349a6 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -547,7 +547,7 @@ static void xlvbd_release_gendisk(struct blkfront_info *info)
         spin_unlock_irqrestore(&blkif_io_lock, flags);
 
         /* Flush gnttab callback work. Must be done with no locks held. */
-        flush_scheduled_work();
+        flush_work_sync(&info->work);
 
         del_gendisk(info->gd);
 
@@ -596,7 +596,7 @@ static void blkif_free(struct blkfront_info *info, int suspend)
         spin_unlock_irq(&blkif_io_lock);
 
         /* Flush gnttab callback work. Must be done with no locks held. */
-        flush_scheduled_work();
+        flush_work_sync(&info->work);
 
         /* Free resources associated with old device channel. */
         if (info->ring_ref != GRANT_INVALID_REF) {