From ee19a045dc70f756cf770ea4867b9ffcda3cb948 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 5 Sep 2012 15:32:53 +0300
Subject: [PATCH] --- yaml --- r: 331401 b: refs/heads/master c:
 f22cf8eb485260ac6e32a614121d44998d83a69a h: refs/heads/master i:   331399:
 0ea9a0309abf700a3f088ab8a10040cc88e5fde9 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/virtio_blk.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 37c2350096ae..9c3f9e5d1e04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c85a1f91b393a6c0c2ad382ba59d7618b29ab758
+refs/heads/master: f22cf8eb485260ac6e32a614121d44998d83a69a
diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c
index 2edfb5cef4f2..53b81d59059b 100644
--- a/trunk/drivers/block/virtio_blk.c
+++ b/trunk/drivers/block/virtio_blk.c
@@ -90,10 +90,12 @@ static inline struct virtblk_req *virtblk_alloc_req(struct virtio_blk *vblk,
 	struct virtblk_req *vbr;
 
 	vbr = mempool_alloc(vblk->pool, gfp_mask);
-	if (vbr && use_bio)
-		sg_init_table(vbr->sg, vblk->sg_elems);
+	if (!vbr)
+		return NULL;
 
 	vbr->vblk = vblk;
+	if (use_bio)
+		sg_init_table(vbr->sg, vblk->sg_elems);
 
 	return vbr;
 }