diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 8fe61b5dc5a6..304d5d130e0c 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -313,7 +313,7 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
 static void xen_blkif_free(struct xen_blkif *blkif)
 {
 
-	xen_blkif_disconnect(blkif);
+	WARN_ON(xen_blkif_disconnect(blkif));
 	xen_vbd_free(&blkif->vbd);
 
 	/* Make sure everything is drained before shutting down */
@@ -505,7 +505,7 @@ static int xen_blkbk_remove(struct xenbus_device *dev)
 	dev_set_drvdata(&dev->dev, NULL);
 
 	if (be->blkif)
-		xen_blkif_disconnect(be->blkif);
+		WARN_ON(xen_blkif_disconnect(be->blkif));
 
 	/* Put the reference we set in xen_blkif_alloc(). */
 	xen_blkif_put(be->blkif);
@@ -792,7 +792,7 @@ static void frontend_changed(struct xenbus_device *dev,
 			 * Clean up so that memory resources can be used by
 			 * other devices. connect_ring reported already error.
 			 */
-			xen_blkif_disconnect(be->blkif);
+			WARN_ON(xen_blkif_disconnect(be->blkif));
 			break;
 		}
 		xen_update_blkif_status(be->blkif);
@@ -803,7 +803,7 @@ static void frontend_changed(struct xenbus_device *dev,
 		break;
 
 	case XenbusStateClosed:
-		xen_blkif_disconnect(be->blkif);
+		WARN_ON(xen_blkif_disconnect(be->blkif));
 		xenbus_switch_state(dev, XenbusStateClosed);
 		if (xenbus_dev_is_online(dev))
 			break;