4.7-stable review patch. If anyone has any objections, please let me know.
------------------ From: Christoph Hellwig <[email protected]> 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 <[email protected]> Signed-off-by: Tejun Heo <[email protected]> Fixes: d684a90d38e2 ("ahci: per-port msix support") Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/ata/libahci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -2516,7 +2516,7 @@ static int ahci_host_activate_multi_irqs /* Do not receive interrupts sent by dummy ports */ if (!pp) { - disable_irq(irq + i); + disable_irq(irq); continue; }
