thunderbolt: Do not call PM runtime functions in tb_retimer_scan()

[platform/kernel/linux-starfive.git] / drivers / scsi / hpsa.c

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index e5cbc97..4dbf51e 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -9786,7 +9786,8 @@ static int hpsa_add_sas_host(struct ctlr_info *h)
        return 0;
 
 free_sas_phy:
-       hpsa_free_sas_phy(hpsa_sas_phy);
+       sas_phy_free(hpsa_sas_phy->phy);
+       kfree(hpsa_sas_phy);
 free_sas_port:
        hpsa_free_sas_port(hpsa_sas_port);
 free_sas_node:
@@ -9822,10 +9823,12 @@ static int hpsa_add_sas_device(struct hpsa_sas_node *hpsa_sas_node,
 
        rc = hpsa_sas_port_add_rphy(hpsa_sas_port, rphy);
        if (rc)
-               goto free_sas_port;
+               goto free_sas_rphy;
 
        return 0;
 
+free_sas_rphy:
+       sas_rphy_free(rphy);
 free_sas_port:
        hpsa_free_sas_port(hpsa_sas_port);
        device->sas_port = NULL;