1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 3a8b810b4980..54f408963201 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -270,6 +270,9 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
                 blkif->blk_rings.common.sring = NULL;
         }
 
+        /* Remove all persistent grants and the cache of ballooned pages. */
+        xen_blkbk_free_caches(blkif);
+
         return 0;
 }
 
@@ -281,9 +284,6 @@ static void xen_blkif_free(struct xen_blkif *blkif)
         xen_blkif_disconnect(blkif);
         xen_vbd_free(&blkif->vbd);
 
-        /* Remove all persistent grants and the cache of ballooned pages. */
-        xen_blkbk_free_caches(blkif);
-
         /* Make sure everything is drained before shutting down */
         BUG_ON(blkif->persistent_gnt_c != 0);
         BUG_ON(atomic_read(&blkif->persistent_gnt_in_use) != 0);