summaryrefslogtreecommitdiff
path: root/drivers/ata/ahci_xgene.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2015-02-09 15:54:41 +0300
committerTejun Heo <tj@kernel.org>2015-02-09 15:54:41 +0300
commitb12aa1f25e1da7e23fa44f646ac46e41366cfc6c (patch)
tree465be1cfceaa37861f5629821e1be2559ba39cfb /drivers/ata/ahci_xgene.c
parentf627cfdeb7d07df7d7ad2e6ebe59f25d8af4212e (diff)
parent09c32aaa3683cbcb6c2787a42f87630dff37d2a5 (diff)
downloadlinux-b12aa1f25e1da7e23fa44f646ac46e41366cfc6c.tar.xz
Merge branch 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata into for-3.20
09c32aaa3683 ("ahci_xgene: Fix the dma state machine lockup for the ATA_CMD_SMART PIO mode command.") missed 3.19 release. Fold it into for-3.20. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/ahci_xgene.c')
-rw-r--r--drivers/ata/ahci_xgene.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index e3b8750e8e9d..2e8bb603e447 100644
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -213,7 +213,8 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc)
}
if (unlikely((ctx->last_cmd[ap->port_no] == ATA_CMD_ID_ATA) ||
- (ctx->last_cmd[ap->port_no] == ATA_CMD_PACKET)))
+ (ctx->last_cmd[ap->port_no] == ATA_CMD_PACKET) ||
+ (ctx->last_cmd[ap->port_no] == ATA_CMD_SMART)))
xgene_ahci_restart_engine(ap);
rc = ahci_qc_issue(qc);