diff options
| author | Tejun Heo <tj@kernel.org> | 2016-09-06 12:35:56 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-09-06 12:35:56 -0400 |
| commit | 2536524a91fe5c5a9fddd282fd4e79ee0976aefe (patch) | |
| tree | 30eb5b4cd6d9ed4fda69526537d4fac454cbc5e6 /drivers/ata/libahci.c | |
| parent | 7d36dd00ab8d57134cce86ad4febc2f5bbdf3e72 (diff) | |
| parent | bc4dee5aa72723632a1f83fd0d3720066c93b433 (diff) | |
Merge branch 'master' into for-4.9
Diffstat (limited to 'drivers/ata/libahci.c')
| -rw-r--r-- | drivers/ata/libahci.c | 2 |
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, | |||
| 2524 | 2524 | ||
| 2525 | /* Do not receive interrupts sent by dummy ports */ | 2525 | /* Do not receive interrupts sent by dummy ports */ |
| 2526 | if (!pp) { | 2526 | if (!pp) { |
| 2527 | disable_irq(irq + i); | 2527 | disable_irq(irq); |
| 2528 | continue; | 2528 | continue; |
| 2529 | } | 2529 | } |
| 2530 | 2530 | ||