diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-02-27 10:05:31 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-02-27 10:05:31 +0100 |
commit | 3bae5cba2da714671ae2ef9dcd59be0e993f1cd2 (patch) | |
tree | a568cbdc970c6ec395d4db62fc240ec6f9b0f1f4 /0001-Test-ata-fix.patch | |
parent | 64d3258298a61aab120966886b54d19e015bf4d3 (diff) | |
parent | 046b8e241965544e2e53642a573eb5c4c7a517c8 (diff) | |
download | kernel-3bae5cba2da714671ae2ef9dcd59be0e993f1cd2.tar.gz kernel-3bae5cba2da714671ae2ef9dcd59be0e993f1cd2.tar.xz kernel-3bae5cba2da714671ae2ef9dcd59be0e993f1cd2.zip |
Merge remote-tracking branch 'origin/f23' into f23-user-thl-vanilla-fedorakernel-4.4.3-300.vanilla.knurd.1.fc23
Diffstat (limited to '0001-Test-ata-fix.patch')
-rw-r--r-- | 0001-Test-ata-fix.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/0001-Test-ata-fix.patch b/0001-Test-ata-fix.patch new file mode 100644 index 000000000..0ae2cf71e --- /dev/null +++ b/0001-Test-ata-fix.patch @@ -0,0 +1,27 @@ +From bb4d91481dd2122351866e500b46cff9399f579d Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@fedoraproject.org> +Date: Thu, 25 Feb 2016 11:40:07 -0800 +Subject: [PATCH] Test ata fix + +Signed-off-by: Laura Abbott <labbott@fedoraproject.org> +--- + drivers/ata/libahci.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c +index 1f225cc..998c6a8 100644 +--- a/drivers/ata/libahci.c ++++ b/drivers/ata/libahci.c +@@ -1142,8 +1142,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; + } + +-- +2.5.0 + |