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

Commit c68cd390 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight: hwtracing: fix dangling pointer issues"

parents f9baae0f 155c1f5f

drivers/hwtracing/coresight/coresight-csr.c

+2 −2
Original line number Diff line number Diff line
@@ -191,8 +191,6 @@ static int csr_probe(struct platform_device *pdev) 
	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;

	/* Store the driver data pointer for use in exported functions */

	csrdrvdata = drvdata;

	drvdata->dev = &pdev->dev;

	platform_set_drvdata(pdev, drvdata);
@@ -220,6 +218,8 @@ static int csr_probe(struct platform_device *pdev) 
	if (IS_ERR(drvdata->csdev))

		return PTR_ERR(drvdata->csdev);



	/* Store the driver data pointer for use in exported functions */

	csrdrvdata = drvdata;

	dev_info(dev, "CSR initialized\n");

	return 0;

}

drivers/hwtracing/coresight/coresight-stm.c

+2 −2
Original line number Diff line number Diff line
@@ -774,8 +774,6 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) 
	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;

	/* Store the driver data pointer for use in exported functions */

	stmdrvdata = drvdata;

	drvdata->dev = &adev->dev;

	dev_set_drvdata(dev, drvdata);
@@ -851,6 +849,8 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) 
	if (boot_enable)

		coresight_enable(drvdata->csdev);



	/* Store the driver data pointer for use in exported functions */

	stmdrvdata = drvdata;

	return 0;

err:

	coresight_unregister(drvdata->csdev);