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

Commit 2daf3a30 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight: tmc: Correct the status for ETR disable"

parents 33a7614d a1aa682f

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

+1 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,7 @@ static void tmc_disable_etr_sink(struct coresight_device *csdev) 
			spin_unlock_irqrestore(&drvdata->spinlock, flags);

			tmc_etr_bam_disable(drvdata);

			usb_qdss_close(drvdata->usbch);

			drvdata->mode = CS_MODE_DISABLED;

			goto out;

		} else {

			tmc_etr_disable_hw(drvdata);

drivers/hwtracing/coresight/coresight.c

+2 −0
Original line number Diff line number Diff line
@@ -812,6 +812,7 @@ static ssize_t enable_source_store(struct device *dev, 
		if (ret)

			return ret;

	} else {

		atomic_set(csdev->refcnt, 1);

		coresight_disable(csdev);

	}
@@ -1058,6 +1059,7 @@ static ssize_t reset_source_sink_store(struct bus_type *bus, 
		csdev = coresight_get_source(cspath->path);

		if (!csdev)

			continue;

		atomic_set(csdev->refcnt, 1);

		__coresight_disable(csdev);

	}