From: Xiang Chen <chenxiang66@xxxxxxxxxxxxx> This series contain two small fixes including: - Handle the NCQ error returned by D2H frame; - Correct the deadline value for ata_wait_after_reset() in function hisi_sas_debug_I_T_nexus_reset(); Chang Log v1 -> v2: - Add one blank line after declaration; - Keep the line which fits in 80 chars in one line; - Directly use jiffies + HISI_SAS_WAIT_PHYUP_TIMEOUT in stead of using ata_deadline(); Xiang Chen (2): scsi: hisi_sas: Handle the NCQ error returned by D2H frame scsi: hisi_sas: Modify the deadline for ata_wait_after_reset() drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) -- 2.30.0