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

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

Merge "coresight: etm: Fail probe for unsupported CPUs"

parents a44ed388 5736f82c

drivers/hwtracing/coresight/coresight-etm4x.c

+6 −1
Original line number Diff line number Diff line
@@ -976,7 +976,12 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) 


	spin_lock_init(&drvdata->spinlock);



	drvdata->cpu = pdata ? pdata->cpu : 0;

	drvdata->cpu = pdata ? pdata->cpu : -1;



	if (drvdata->cpu == -1) {

		dev_info(dev, "CPU not available\n");

		return -ENODEV;

	}



	get_online_cpus();

drivers/hwtracing/coresight/of_coresight.c

+2 −2
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ struct coresight_platform_data *of_get_coresight_platform_data( 
		} while (ep);

	}



	/* Affinity defaults to CPU0 */

	pdata->cpu = 0;

	/* Affinity defaults to invalid */

	pdata->cpu = -1;

	dn = of_parse_phandle(node, "cpu", 0);

	for (cpu = 0; dn && cpu < nr_cpu_ids; cpu++) {

		if (dn == of_get_cpu_node(cpu, NULL)) {