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

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

Merge "coresight: set etmdrvdata just before put_online_cpus"

parents 117a6de3 0208cdf6

drivers/coresight/coresight-etm.c

+6 −5
Original line number Diff line number Diff line
@@ -2364,8 +2364,6 @@ static int etm_probe(struct platform_device *pdev) 
		goto err0;

	}



	etmdrvdata[drvdata->cpu] = drvdata;



	if (count++ == 0)

		register_hotcpu_notifier(&etm_cpu_notifier);
@@ -2403,20 +2401,23 @@ static int etm_probe(struct platform_device *pdev) 
		}

	}



	etmdrvdata[drvdata->cpu] = drvdata;



	put_online_cpus();



	clk_disable_unprepare(drvdata->clk);



	if (drvdata->os_unlock) {

	mutex_lock(&drvdata->mutex);

	if (drvdata->os_unlock && !drvdata->init) {

		ret = etm_late_init(drvdata);

		if (ret) {

			mutex_unlock(&drvdata->mutex);

			goto err1;

		}

		drvdata->init = true;

		mutex_unlock(&drvdata->mutex);

	}

	mutex_unlock(&drvdata->mutex);



	return 0;

err1:

	if (--count == 0)

drivers/coresight/coresight-etmv4.c

+6 −5
Original line number Diff line number Diff line
@@ -3441,8 +3441,6 @@ static int etm_probe(struct platform_device *pdev) 
		goto err0;

	}



	etmdrvdata[drvdata->cpu] = drvdata;



	if (count++ == 0)

		register_hotcpu_notifier(&etm_cpu_notifier);
@@ -3474,20 +3472,23 @@ static int etm_probe(struct platform_device *pdev) 
		}

	}



	etmdrvdata[drvdata->cpu] = drvdata;



	put_online_cpus();



	clk_disable_unprepare(drvdata->clk);



	if (drvdata->os_unlock) {

	mutex_lock(&drvdata->mutex);

	if (drvdata->os_unlock && !drvdata->init) {

		ret = etm_late_init(drvdata);

		if (ret) {

			mutex_unlock(&drvdata->mutex);

			goto err1;

		}

		drvdata->init = true;

		mutex_unlock(&drvdata->mutex);

	}

	mutex_unlock(&drvdata->mutex);



	return 0;

err1:

	if (--count == 0)