summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libahci.c
diff options
context:
space:
mode:
authorTejun Heo2016-09-06 18:35:56 +0200
committerTejun Heo2016-09-06 18:35:56 +0200
commit2536524a91fe5c5a9fddd282fd4e79ee0976aefe (patch)
tree30eb5b4cd6d9ed4fda69526537d4fac454cbc5e6 /drivers/ata/libahci.c
parentlibata: SCT Write Same handle ATA_DFLAG_PIO (diff)
parentMerge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert... (diff)
downloadkernel-qcow2-linux-2536524a91fe5c5a9fddd282fd4e79ee0976aefe.tar.gz
kernel-qcow2-linux-2536524a91fe5c5a9fddd282fd4e79ee0976aefe.tar.xz
kernel-qcow2-linux-2536524a91fe5c5a9fddd282fd4e79ee0976aefe.zip
Merge branch 'master' into for-4.9
Diffstat (limited to 'drivers/ata/libahci.c')
-rw-r--r--drivers/ata/libahci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 7c01192d3c48..5a1329e31609 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -2524,7 +2524,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;
}