summaryrefslogtreecommitdiff
path: root/drivers/ata/libahci.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2016-03-11 12:30:17 -0500
committerTejun Heo <tj@kernel.org>2016-03-11 12:30:17 -0500
commitfe6c58146d42785386ca69bb1e35d53ac5940cb7 (patch)
treebe4006ac033d638071f65851403c42b382b23427 /drivers/ata/libahci.c
parent51b1b2867b81450bd198b691c70dccb582e961ff (diff)
parentdc8b4afc4a04fac8ee55a19b59f2356a25e7e778 (diff)
Merge branch 'for-4.5-fixes' into for-4.6
Diffstat (limited to 'drivers/ata/libahci.c')
-rw-r--r--drivers/ata/libahci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 2d21b46db714..3982054060b8 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1211,8 +1211,7 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap,
/* mark esata ports */
tmp = readl(port_mmio + PORT_CMD);
- if ((tmp & PORT_CMD_HPCP) ||
- ((tmp & PORT_CMD_ESP) && (hpriv->cap & HOST_CAP_SXS)))
+ if ((tmp & PORT_CMD_ESP) && (hpriv->cap & HOST_CAP_SXS))
ap->pflags |= ATA_PFLAG_EXTERNAL;
}