Linux v3.19-rc5-117-g5eb11d6b3f55

- Reenable debugging options.
This commit is contained in:
Josh Boyer 2015-01-21 09:50:33 -05:00
commit 08cb3a2b46
10 changed files with 75 additions and 80 deletions

View file

@ -3032,16 +3032,6 @@ index feeb8f1..8f82267 100644
#include "ahci.h"
/* Max # of disk per a controller */
@@ -137,7 +138,8 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc)
struct xgene_ahci_context *ctx = hpriv->plat_data;
int rc = 0;
- if (unlikely(ctx->last_cmd[ap->port_no] == ATA_CMD_ID_ATA))
+ if (unlikely(ctx->last_cmd[ap->port_no] == ATA_CMD_ID_ATA ||
+ ctx->last_cmd[ap->port_no] == ATA_CMD_SMART))
xgene_ahci_restart_engine(ap);
rc = ahci_qc_issue(qc);
@@ -148,14 +150,6 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc)
return rc;
}