diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 06:52:14 +0200 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 06:52:14 +0200 |
| commit | 111b23cf895b5cbcdc1b2c6580be1bb78a577d05 (patch) | |
| tree | 89b840115ccd753216ba0b26e587e52699b99310 /drivers/ata/libahci.c | |
| parent | intel powerclamp: support Knights Landing (diff) | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent... (diff) | |
| download | linux-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.tar.xz linux-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.zip | |
Merge branches 'release' and 'thermal-soc' of .git into next
Diffstat (limited to 'drivers/ata/libahci.c')
| -rw-r--r-- | drivers/ata/libahci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 61a9c07e0dff..287c4ba0219f 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1707,8 +1707,7 @@ static void ahci_handle_port_interrupt(struct ata_port *ap, if (unlikely(resetting)) status &= ~PORT_IRQ_BAD_PMP; - /* if LPM is enabled, PHYRDY doesn't mean anything */ - if (ap->link.lpm_policy > ATA_LPM_MAX_POWER) { + if (sata_lpm_ignore_phy_events(&ap->link)) { status &= ~PORT_IRQ_PHYRDY; ahci_scr_write(&ap->link, SCR_ERROR, SERR_PHYRDY_CHG); } |