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

Commit 1570729f authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight: tpdm: Fix tpdm compile issue"

parents 80ad5bfc 81cfb065

drivers/hwtracing/coresight/coresight-tpda.c

+1 −2
Original line number Diff line number Diff line
@@ -646,8 +646,7 @@ static int tpda_parse_cmb(struct tpda_drvdata *drvdata) 


static int tpda_parse_of_data(struct tpda_drvdata *drvdata)

{

	int len, port, i, ret;

	const __be32 *prop;

	int ret;

	struct device_node *node = drvdata->dev->of_node;



	ret = of_property_read_u32(node, "qcom,tpda-atid", &drvdata->atid);

drivers/hwtracing/coresight/coresight-tpdm.c

+2 −2
Original line number Diff line number Diff line
@@ -4203,7 +4203,7 @@ static int tpdm_parse_of_data(struct tpdm_drvdata *drvdata) 
			if (ret)

				return ret;



			drvdata->treg[i] = devm_regulator_get(drvdata,

			drvdata->treg[i] = devm_regulator_get(drvdata->dev,

							treg_name);

			if (IS_ERR(drvdata->treg[i]))

				return PTR_ERR(drvdata->treg[i]);