lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 102/175] scsi: pm80xx: Fix error return in pm8001_pci_probe()
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ Upstream commit 97031ccffa4f62728602bfea8439dd045cd3aeb2 ]

    The driver did not return an error in the case where
    pm8001_configure_phy_settings() failed.

    Use rc to store the return value of pm8001_configure_phy_settings().

    Link: https://lore.kernel.org/r/20201205115551.2079471-1-zhangqilong3@huawei.com
    Fixes: 279094079a44 ("[SCSI] pm80xx: Phy settings support for motherboard controller.")
    Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com>
    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/pm8001/pm8001_init.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
    index 9fc675f57e336..f54115d74f519 100644
    --- a/drivers/scsi/pm8001/pm8001_init.c
    +++ b/drivers/scsi/pm8001/pm8001_init.c
    @@ -1061,7 +1061,8 @@ static int pm8001_pci_probe(struct pci_dev *pdev,

    pm8001_init_sas_add(pm8001_ha);
    /* phy setting support for motherboard controller */
    - if (pm8001_configure_phy_settings(pm8001_ha))
    + rc = pm8001_configure_phy_settings(pm8001_ha);
    + if (rc)
    goto err_out_shost;

    pm8001_post_sas_ha_init(shost, chip);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 17:34    [W:4.037 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site