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

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

Merge "coresight-tmc-etr: Fix conditional check in TMC read"

parents 9c0fef23 8fc8223a

drivers/hwtracing/coresight/coresight-byte-cntr.c

+1 −2
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ struct byte_cntr *byte_cntr_init(struct amba_device *adev, 
	if (byte_cntr_irq < 0)

		return NULL;



	byte_cntr_data = devm_kmalloc(dev, sizeof(*byte_cntr_data), GFP_KERNEL);

	byte_cntr_data = devm_kzalloc(dev, sizeof(*byte_cntr_data), GFP_KERNEL);

	if (!byte_cntr_data)

		return NULL;
@@ -363,7 +363,6 @@ struct byte_cntr *byte_cntr_init(struct amba_device *adev, 
	}



	tmcdrvdata = drvdata;

	byte_cntr_data->block_size = 0;

	byte_cntr_data->byte_cntr_irq = byte_cntr_irq;

	atomic_set(&byte_cntr_data->irq_cnt, 0);

	init_waitqueue_head(&byte_cntr_data->wq);

drivers/hwtracing/coresight/coresight-tmc-etr.c

+1 −1
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ int tmc_read_prepare_etr(struct tmc_drvdata *drvdata) 
		goto out;

	}



	if (!drvdata->byte_cntr || drvdata->byte_cntr->enable) {

	if (drvdata->byte_cntr && drvdata->byte_cntr->enable) {

		ret = -EINVAL;

		goto out;

	}