From: Christoph Hellwig <hch@lst.de>
Date: Thu, 11 Aug 2016 14:26:01 +0000 (-0700)
Subject: ahci: disable correct irq for dummy ports
X-Git-Tag: v4.7.5~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ea19be4d9eb686728b877adaa9b6ad1aae3c1ac;p=thirdparty%2Fkernel%2Fstable.git

ahci: disable correct irq for dummy ports

commit 9b4b3f6a062b22550e62523efe5213776cdd426b upstream.

irq already contains the interrupt number for the port, don't add the
port index to it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
Fixes: d684a90d38e2 ("ahci: per-port msix support")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 71b07198e207d..ccd8cc47c4cf0 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -2516,7 +2516,7 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host,
 
 		/* Do not receive interrupts sent by dummy ports */
 		if (!pp) {
-			disable_irq(irq + i);
+			disable_irq(irq);
 			continue;
 		}