From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Thu, 20 Jan 2011 18:42:34 +0000 (-0500)
Subject: NVMe: Fix admin IRQ claim on real hardware
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=53c9577e9ca68a633c6e9df2b54eaecacfa77f62;p=linux-beck.git

NVMe: Fix admin IRQ claim on real hardware

The admin IRQ is supposed to use the pin-based (or single message MSI)
interrupt.  Accomplish this by filling in entry[0]'s vector with the
INTx irq number.

Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
---

diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 3d917a87ea93..44a9d5edd8db 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -979,6 +979,7 @@ static int __devinit nvme_probe(struct pci_dev *pdev,
 	pci_set_drvdata(pdev, dev);
 	dma_set_mask(&dev->pci_dev->dev, DMA_BIT_MASK(64));
 	nvme_set_instance(dev);
+	dev->entry[0].vector = pdev->irq;
 
 	dev->bar = ioremap(pci_resource_start(pdev, 0), 8192);
 	if (!dev->bar) {