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

Commit d62e255e authored by Liang He's avatar Liang He Committed by Greg Kroah-Hartman
Browse files

scsi: ufs: host: Hold reference returned by of_parse_phandle() 

commit a3435afba87dc6cd83f5595e7607f3c40f93ef01 upstream.

In ufshcd_populate_vreg(), we should hold the reference returned by
of_parse_phandle() and then use it to call of_node_put() for refcount
balance.

Link: https://lore.kernel.org/r/20220719071529.1081166-1-windhl@126.com


Fixes: aa497613 ("ufs: Add regulator enable support")
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarLiang He <windhl@126.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b1343528

drivers/scsi/ufs/ufshcd-pltfrm.c

+13 −2
Original line number Diff line number Diff line
@@ -125,6 +125,17 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba) 
	return ret;

}



static bool phandle_exists(const struct device_node *np,

			   const char *phandle_name, int index)

{

	struct device_node *parse_np = of_parse_phandle(np, phandle_name, index);



	if (parse_np)

		of_node_put(parse_np);



	return parse_np != NULL;

}



#define MAX_PROP_SIZE 32

static int ufshcd_populate_vreg(struct device *dev, const char *name,

				struct ufs_vreg **out_vreg)
@@ -140,7 +151,7 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name, 
	}



	snprintf(prop_name, MAX_PROP_SIZE, "%s-supply", name);

	if (!of_parse_phandle(np, prop_name, 0)) {

	if (!phandle_exists(np, prop_name, 0)) {

		dev_info(dev, "%s: Unable to find %s regulator, assuming enabled\n",

				__func__, prop_name);

		goto out;