A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "coresight-tmc-etr: fix memory leak"

Browse source
This commit is contained in:
qctecmdr 2021-04-29 21:27:44 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0b0fccfc72
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/hwtracing/coresight/coresight-tmc-etr.c
View file

@ -1089,7 +1089,7 @@ ssize_t tmc_etr_get_sysfs_trace(struct tmc_drvdata *drvdata,
static struct etr_buf *
tmc_etr_setup_sysfs_buf(struct tmc_drvdata *drvdata)
{
struct etr_buf *sysfs_buf = NULL;
struct etr_buf *sysfs_buf = NULL, *new_buf = NULL;
/*
* If we are enabling the ETR from disabled state, we need to make
@ -1110,16 +1110,16 @@ tmc_etr_setup_sysfs_buf(struct tmc_drvdata *drvdata)
if (drvdata->out_mode == TMC_ETR_OUT_MODE_USB
&& drvdata->byte_cntr->sw_usb)
sysfs_buf = tmc_alloc_etr_buf(drvdata, TMC_ETR_SW_USB_BUF_SIZE,
new_buf = tmc_alloc_etr_buf(drvdata, TMC_ETR_SW_USB_BUF_SIZE,
0, cpu_to_node(0), NULL);
else if (drvdata->out_mode == TMC_ETR_OUT_MODE_PCIE)
sysfs_buf = tmc_alloc_etr_buf(drvdata, TMC_ETR_PCIE_MEM_SIZE,
new_buf = tmc_alloc_etr_buf(drvdata, TMC_ETR_PCIE_MEM_SIZE,
0, cpu_to_node(0), NULL);
else
sysfs_buf = tmc_alloc_etr_buf(drvdata, drvdata->size,
new_buf = tmc_alloc_etr_buf(drvdata, drvdata->size,
0, cpu_to_node(0), NULL);
}
return sysfs_buf;
return new_buf;
}
static void
@ -1603,7 +1603,7 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev)
int ret = 0;
unsigned long flags;
struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
struct etr_buf *sysfs_buf = NULL, *new_buf = NULL, *free_buf = NULL;
struct etr_buf *new_buf = NULL, *free_buf = NULL;
spin_lock_irqsave(&drvdata->spinlock, flags);
if (drvdata->reading) {
@ -1647,7 +1647,7 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev)
* use the buffer allocated above. Otherwise reuse the existing buffer.
*/
if (new_buf) {
free_buf = sysfs_buf;
free_buf = drvdata->sysfs_buf;
drvdata->sysfs_buf = new_buf;
}
ret = tmc_etr_enable_hw(drvdata, drvdata->sysfs_buf);