diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-02-05 05:37:52 (GMT) |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-02-05 05:37:52 (GMT) |
| commit | 12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6 (patch) | |
| tree | b8fe38b24a2070d5b0cb2279f86e98b6dce98c46 /drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | |
| parent | 6344a5cd3e8acf6e9823046cebd00b16faacdb1a (diff) | |
| parent | 0fb5b1fb30fba3671dd5b1489d78e93e08d62e4e (diff) | |
| download | linux-12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6.tar.xz | |
Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi/hisi_sas/hisi_sas_v1_hw.c')
| -rw-r--r-- | drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c index 057fdeb..eea24d7 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c @@ -1289,13 +1289,10 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba, goto out; } - if (cmplt_hdr_data & CMPLT_HDR_ERR_RCRD_XFRD_MSK) { - if (!(cmplt_hdr_data & CMPLT_HDR_CMD_CMPLT_MSK) || - !(cmplt_hdr_data & CMPLT_HDR_RSPNS_XFRD_MSK)) - ts->stat = SAS_DATA_OVERRUN; - else - slot_err_v1_hw(hisi_hba, task, slot); + if (cmplt_hdr_data & CMPLT_HDR_ERR_RCRD_XFRD_MSK && + !(cmplt_hdr_data & CMPLT_HDR_RSPNS_XFRD_MSK)) { + slot_err_v1_hw(hisi_hba, task, slot); goto out; } |