scsi: hisi_sas: Return directly if init hardware failed
authorXiang Chen <chenxiang66@hisilicon.com>
Tue, 12 Nov 2019 09:30:57 +0000 (17:30 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jan 2020 07:22:58 +0000 (08:22 +0100)
commit 547fde8b5a1923050f388caae4f76613b5a620e0 upstream.

Need to return directly if init hardware failed.

Fixes: 73a4925d154c ("scsi: hisi_sas: Update all the registers after suspend and resume")
Link: https://lore.kernel.org/r/1573551059-107873-3-git-send-email-john.garry@huawei.com
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

index c4f76d7..723f51c 100644 (file)
@@ -3423,6 +3423,7 @@ static int hisi_sas_v3_resume(struct pci_dev *pdev)
        if (rc) {
                scsi_remove_host(shost);
                pci_disable_device(pdev);
+               return rc;
        }
        hisi_hba->hw->phys_init(hisi_hba);
        sas_resume_ha(sha);