---

yaml --- r: 376927 b: refs/heads/master c: 1287dab h: refs/heads/master i: 376925: 81df7fd 376923: 5121088 376919: 7154b98 376911: eefb4e8 376895: d3f041c v: v3
git-mirror · May 17, 2013 · d8fa4c0 · d8fa4c0
1 parent 37ba98c
commit d8fa4c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5460fc03105fbed01fe27aa572d9f65bb410a61d
+refs/heads/master: 1287dabd345f447bbe0f7a99fc95ab89bcfc0f5d
diff --git a/trunk/drivers/block/nvme-core.c b/trunk/drivers/block/nvme-core.c
@@ -629,7 +629,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
 	struct nvme_command *cmnd;
 	struct nvme_iod *iod;
 	enum dma_data_direction dma_dir;
-	int cmdid, length, result = -ENOMEM;
+	int cmdid, length, result;
 	u16 control;
 	u32 dsmgmt;
 	int psegs = bio_phys_segments(ns->queue, bio);
@@ -640,6 +640,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
 			return result;
 	}
 
+	result = -ENOMEM;
 	iod = nvme_alloc_iod(psegs, bio->bi_size, GFP_ATOMIC);
 	if (!iod)
 		goto nomem;