Merge branch 'master' into for-4.9

2016-09-06 12:35:56 -04:00
parent 7d36dd00ab bc4dee5aa7
commit 2536524a91
1047 changed files with 11984 additions and 5885 deletions
--- 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;
 		}