From d8fa4c0ff27a2b5b33ed03ef2a6fd431141d33af Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 13 May 2013 22:29:04 +0800
Subject: [PATCH] --- yaml --- r: 376927 b: refs/heads/master c:
 1287dabd345f447bbe0f7a99fc95ab89bcfc0f5d h: refs/heads/master i:   376925:
 81df7fde93277d990be467df8471a91d4666462b   376923:
 51210886d61e3f6be63e2cdc60166fd8bb342539   376919:
 7154b98d9c38fbaaf6f83b370fe386ddfa0cd1f1   376911:
 eefb4e81c486ab04a511a77b9ec9720cc6591e5e   376895:
 d3f041c486ccc93e126827b21d3258373ee17288 v: v3

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

diff --git a/[refs] b/[refs]
index e29aaa473450..0aaeac23d922 100644
--- 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
index 437637551d1e..d783f15e0fc5 100644
--- 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;