From 42f677913db34f126cb6bfd6c26a899de3f949e9 Mon Sep 17 00:00:00 2001
From: Shane Michael Matthews <shane.matthews@intel.com>
Date: Tue, 1 Feb 2011 11:31:55 -0500
Subject: [PATCH] --- yaml --- r: 286240 b: refs/heads/master c:
 5911f20039ce59d7e7834f0c42151cf759b6f786 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1c4c605124c3..433559745c48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 574e8b95bc3780e10e9b5e9d51074d503dd3d5d9
+refs/heads/master: 5911f20039ce59d7e7834f0c42151cf759b6f786
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index bda91178f475..e3d921577b94 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -668,6 +668,7 @@ static int __devinit nvme_configure_admin_queue(struct nvme_dev *dev)
 	dev->ctrl_config |= (PAGE_SHIFT - 12) << NVME_CC_MPS_SHIFT;
 	dev->ctrl_config |= NVME_CC_ARB_RR | NVME_CC_SHN_NONE;
 
+	writel(0, &dev->bar->cc);
 	writel(aqa, &dev->bar->aqa);
 	writeq(nvmeq->sq_dma_addr, &dev->bar->asq);
 	writeq(nvmeq->cq_dma_addr, &dev->bar->acq);