diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-18 02:55:13 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-18 02:55:13 +0300 |
| commit | 9d066a252786e1a18484a6283f82614d42a9f4ac (patch) | |
| tree | 72188d2f86b3d0c4100257c8d5734f2c648a8bc7 /drivers/scsi/pm8001/pm8001_sas.c | |
| parent | 79ee2e8f730411a30b271d5f9cdeae189fa66174 (diff) | |
| parent | b00345d1994d588fa2687e1238fcd542f0320cba (diff) | |
| download | linux-9d066a252786e1a18484a6283f82614d42a9f4ac.tar.xz | |
Merge branches 'pm-opp' and 'pm-cpufreq-fixes'
* pm-opp:
PM / OPP: Add 'UNKNOWN' status for shared_opp in struct opp_table
* pm-cpufreq-fixes:
cpufreq: intel_pstate: Adjust _PSS[0] freqeuency if needed
Diffstat (limited to 'drivers/scsi/pm8001/pm8001_sas.c')
| -rw-r--r-- | drivers/scsi/pm8001/pm8001_sas.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index 949198c01ced..dc33dfa8f994 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c @@ -280,7 +280,10 @@ u32 pm8001_get_ncq_tag(struct sas_task *task, u32 *tag) struct ata_queued_cmd *qc = task->uldd_task; if (qc) { if (qc->tf.command == ATA_CMD_FPDMA_WRITE || - qc->tf.command == ATA_CMD_FPDMA_READ) { + qc->tf.command == ATA_CMD_FPDMA_READ || + qc->tf.command == ATA_CMD_FPDMA_RECV || + qc->tf.command == ATA_CMD_FPDMA_SEND || + qc->tf.command == ATA_CMD_NCQ_NON_DATA) { *tag = qc->tag; return 1; } |