Merge branch 'stable/for-jens-4.12' of git://git.kernel.org/pub/scm/l…

…inux/kernel/git/konrad/xen into for-linus Pull a single fix from Konrad.
mariux64 · May 15, 2017 · d3f7c35 · d3f7c35
2 parents a00ebd1 + 2d4456c
commit d3f7c35
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
@@ -504,11 +504,13 @@ static int xen_blkbk_remove(struct xenbus_device *dev)
 
 	dev_set_drvdata(&dev->dev, NULL);
 
-	if (be->blkif)
+	if (be->blkif) {
 		xen_blkif_disconnect(be->blkif);
 
-	/* Put the reference we set in xen_blkif_alloc(). */
-	xen_blkif_put(be->blkif);
+		/* Put the reference we set in xen_blkif_alloc(). */
+		xen_blkif_put(be->blkif);
+	}
+
 	kfree(be->mode);
 	kfree(be);
 	return 0;