From edb4d240b0f260930fe7c7ee45723064156655f2 Mon Sep 17 00:00:00 2001
From: Keith Busch <keith.busch@intel.com>
Date: Thu, 31 Jan 2013 14:40:38 -0700
Subject: [PATCH] --- yaml --- r: 361685 b: refs/heads/master c:
 122090366d1d5c6ec1bfb6dfdb3a6d121ff074aa h: refs/heads/master i:   361683:
 d8dd349eef3071993803d243721a9e657e476392 v: v3

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

diff --git a/[refs] b/[refs]
index 9110481b60a5..1ed964307830 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79461681692a337442c6a5cf44deba120a57186a
+refs/heads/master: 122090366d1d5c6ec1bfb6dfdb3a6d121ff074aa
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index 993c014d195a..e209ec5930cc 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -1540,7 +1540,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
 		res = nvme_get_features(dev, NVME_FEAT_LBA_RANGE, i,
 							dma_addr + 4096, NULL);
 		if (res)
-			continue;
+			memset(mem + 4096, 0, 4096);
 
 		ns = nvme_alloc_ns(dev, i, mem, mem + 4096);
 		if (ns)