]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ahci: disable correct irq for dummy ports
authorChristoph Hellwig <hch@lst.de>
Thu, 11 Aug 2016 14:26:01 +0000 (07:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 24 Sep 2016 08:09:28 +0000 (10:09 +0200)
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>
drivers/ata/libahci.c

index 71b07198e207d2577a8e52fe736f91f54b39a226..ccd8cc47c4cf0235015b0e9922b8eb8778edfea9 100644 (file)
@@ -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;
                }