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>

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);