virtio-blk: fix NULL checking in virtblk_alloc_req()

Smatch complains about the inconsistent NULL checking here.  Fix it to
return NULL on failure.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (fixed accidental deletion)

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 2edfb5cef4f2126631ee42f1dcd5f0d55e08313b..53b81d59059b5d4074b582aab6432ccdba42e79b 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/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;
 }