---

yaml --- r: 286240 b: refs/heads/master c: 5911f20 h: refs/heads/master v: v3
git-mirror · Nov 4, 2011 · 42f6779 · 42f6779
1 parent 7ba2c60
commit 42f6779
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);