diff options
author | 2019-04-12 21:27:23 -0400 | |
---|---|---|
committer | 2019-04-12 21:27:23 -0400 | |
commit | 17631462cd49f3dfa9db38a9e578c59f71ccf414 (patch) | |
tree | 0e44caf23bacf31cea3b414132db94ba92bd7e34 /drivers/scsi/hisi_sas/hisi_sas_main.c | |
parent | scsi: target/iscsi: Make sure PDU processing continues if parsing a command fails (diff) | |
parent | scsi: csiostor: fix missing data copy in csio_scsi_err_handler() (diff) | |
download | linux-dev-17631462cd49f3dfa9db38a9e578c59f71ccf414.tar.xz linux-dev-17631462cd49f3dfa9db38a9e578c59f71ccf414.zip |
Merge branch '5.1/scsi-fixes' into 5.2/merge
We have a few submissions for 5.2 that depend on fixes merged post
5.1-rc1. Merge the fixes branch into queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/hisi_sas/hisi_sas_main.c')
-rw-r--r-- | drivers/scsi/hisi_sas/hisi_sas_main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 3c3cf89f713f..14bac4966c87 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1801,6 +1801,12 @@ static int hisi_sas_I_T_nexus_reset(struct domain_device *device) } hisi_sas_dereg_device(hisi_hba, device); + if (dev_is_sata(device)) { + rc = hisi_sas_softreset_ata_disk(device); + if (rc) + return TMF_RESP_FUNC_FAILED; + } + rc = hisi_sas_debug_I_T_nexus_reset(device); if ((rc == TMF_RESP_FUNC_COMPLETE) || (rc == -ENODEV)) |