Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3f7c35c authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'stable/for-jens-4.12' of... 

Merge branch 'stable/for-jens-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus

Pull a single fix from Konrad.
parents a00ebd1c 2d4456c7

drivers/block/xen-blkback/xenbus.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -504,11 +504,13 @@ static int xen_blkbk_remove(struct xenbus_device *dev) 




	dev_set_drvdata(&dev->dev, NULL);

	dev_set_drvdata(&dev->dev, NULL);





	if (be->blkif)

	if (be->blkif) {

		xen_blkif_disconnect(be->blkif);

		xen_blkif_disconnect(be->blkif);





		/* Put the reference we set in xen_blkif_alloc(). */

		/* Put the reference we set in xen_blkif_alloc(). */

		xen_blkif_put(be->blkif);

		xen_blkif_put(be->blkif);

	}



	kfree(be->mode);

	kfree(be->mode);

	kfree(be);

	kfree(be);

	return 0;

	return 0;