Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11ffb2d6 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

scsi: ufs: handle cleanup correctly on devm_reset_control_get error 



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: default avatarGreg 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: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210503115736.2104747-32-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6db3667f

drivers/scsi/ufs/ufs-hisi.c

+12 −5
Original line number Diff line number Diff line
@@ -544,16 +544,23 @@ static int ufs_hisi_init_common(struct ufs_hba *hba) 
	ufshcd_set_variant(hba, host);



	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)