Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / osd / osd_initiator.c

diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 52e243b770001c6a2f04cd094404926cf269e7ad..488c3929f19a95b84377d9ae522fb9b236857d3c 100644 (file)
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -1567,8 +1567,8 @@ static struct request *_make_request(struct request_queue *q, bool has_write,
                struct request *req;
 
                req = blk_get_request(q, has_write ? WRITE : READ, flags);
-               if (unlikely(!req))
-                       return ERR_PTR(-ENOMEM);
+               if (IS_ERR(req))
+                       return req;
 
                blk_rq_set_block_pc(req);
                return req;