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

Commit 026e0119 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight: Add spin_lock_init for funnel and replicator"

parents fd77bb96 2966cf8c

drivers/hwtracing/coresight/coresight-funnel.c

+3 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2011-2012,2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2012,2017, 2020, The Linux Foundation. All rights reserved.

 *

 * Description: CoreSight Funnel driver

 */
@@ -286,6 +286,8 @@ static int funnel_probe(struct device *dev, struct resource *res) 


	dev_set_drvdata(dev, drvdata);



	spin_lock_init(&drvdata->spinlock);



	pdata = coresight_get_platform_data(dev);

	if (IS_ERR(pdata)) {

		ret = PTR_ERR(pdata);

drivers/hwtracing/coresight/coresight-replicator.c

+3 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2015, 2020, The Linux Foundation. All rights reserved.

 *

 * Description: CoreSight Replicator driver

 */
@@ -241,6 +241,8 @@ static int replicator_probe(struct device *dev, struct resource *res) 


	dev_set_drvdata(dev, drvdata);



	spin_lock_init(&drvdata->spinlock);



	pdata = coresight_get_platform_data(dev);

	if (IS_ERR(pdata)) {

		ret = PTR_ERR(pdata);