Merge tag 'for-linus-4.20a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / block / xen-blkfront.c

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 9ac3999a55b7a678cc3a91962ca268e82b535df1..0ed4b200fa5855e10a142b6f6ce237901cf749ec 100644 (file)
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -2494,6 +2494,9 @@ static int blkfront_remove(struct xenbus_device *xbdev)
 
        dev_dbg(&xbdev->dev, "%s removed", xbdev->nodename);
 
+       if (!info)
+               return 0;
+
        blkif_free(info, 0);
 
        mutex_lock(&info->mutex);