lkml.org 
[lkml]   [2021]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 112/127] scsi: ufs: handle cleanup correctly on devm_reset_control_get error
    Date
    From: Phillip Potter <phil@philpotter.co.uk>

    commit 2f4a784f40f8d337d6590e2e93f46429052e15ac upstream.

    Move ufshcd_set_variant call in ufs_hisi_init_common to common error
    section at end of the function, and then jump to this from the error
    checking statements for both devm_reset_control_get and
    ufs_hisi_get_resource. This fixes the original commit (63a06181d7ce)
    which was reverted due to the University of Minnesota problems.

    Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Avri Altman <avri.altman@wdc.com>
    Cc: Martin K. Petersen <martin.petersen@oracle.com>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
    Link: https://lore.kernel.org/r/20210503115736.2104747-32-gregkh@linuxfoundation.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/scsi/ufs/ufs-hisi.c | 17 ++++++++++++-----
    1 file changed, 12 insertions(+), 5 deletions(-)

    --- a/drivers/scsi/ufs/ufs-hisi.c
    +++ b/drivers/scsi/ufs/ufs-hisi.c
    @@ -467,17 +467,24 @@ static int ufs_hisi_init_common(struct u
    host->hba = hba;
    ufshcd_set_variant(hba, host);

    - host->rst = devm_reset_control_get(dev, "rst");
    + host->rst = devm_reset_control_get(dev, "rst");
    + if (IS_ERR(host->rst)) {
    + dev_err(dev, "%s: failed to get reset control\n", __func__);
    + err = PTR_ERR(host->rst);
    + goto error;
    + }

    ufs_hisi_set_pm_lvl(hba);

    err = ufs_hisi_get_resource(host);
    - if (err) {
    - ufshcd_set_variant(hba, NULL);
    - return err;
    - }
    + if (err)
    + goto error;

    return 0;
    +
    +error:
    + ufshcd_set_variant(hba, NULL);
    + return err;
    }

    static int ufs_hi3660_init(struct ufs_hba *hba)

    \
     
     \ /
      Last update: 2021-05-24 18:08    [W:4.075 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site