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

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

Merge "coresight: fix the dangling pointer issues on coresight"

parents c5f4a0a0 f93baafc

drivers/coresight/coresight-csr.c

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, 2015 The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2013, 2015-2016 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -190,8 +190,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,9 @@ 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/coresight/coresight-fuse.c

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -303,8 +303,6 @@ static int fuse_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 */

	fusedrvdata = drvdata;

	drvdata->dev = &pdev->dev;

	platform_set_drvdata(pdev, drvdata);
@@ -368,6 +366,9 @@ static int fuse_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 */

	fusedrvdata = drvdata;



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

	return 0;

}

drivers/soc/qcom/jtag-fuse.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -152,8 +152,6 @@ static int jtag_fuse_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 */

	fusedrvdata = drvdata;

	drvdata->dev = &pdev->dev;

	platform_set_drvdata(pdev, drvdata);
@@ -174,6 +172,8 @@ static int jtag_fuse_probe(struct platform_device *pdev) 
	if (!drvdata->base)

		return -ENOMEM;



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

	fusedrvdata = drvdata;

	dev_info(dev, "JTag Fuse initialized\n");

	return 0;

}