Skip to content

dma-trace: free buffer on error #3562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Nov 9, 2020
Merged

dma-trace: free buffer on error #3562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/trace/dma-trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,19 @@ static int dma_trace_buffer_init(struct dma_trace_data *d)
return 0;
}

static void dma_trace_buffer_free(struct dma_trace_data *d)
{
struct dma_trace_buf *buffer = &d->dmatb;
unsigned int flags;

spin_lock_irq(&d->lock, flags);

rfree(buffer->addr);
memset(buffer, 0, sizeof(*buffer));
Comment thread
cujomalainey marked this conversation as resolved.
Resolved

spin_unlock_irq(&d->lock, flags);
}

#if CONFIG_DMA_GW

static int dma_trace_start(struct dma_trace_data *d)
Expand Down Expand Up @@ -349,6 +362,9 @@ int dma_trace_enable(struct dma_trace_data *d)
schedule_task(&d->dmat_work, DMA_TRACE_PERIOD, DMA_TRACE_PERIOD);

out:
if (err < 0)
dma_trace_buffer_free(d);

platform_shared_commit(d, sizeof(*d));

return err;
Expand Down