diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-04-28 12:00:36 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-04-28 12:00:36 +0200 |
commit | 474a59610729a178cd3c9a6ab990da770b856c74 (patch) | |
tree | 4b2967dee40ee4d7269fd0b2c59088b4d9bc1286 /tools/perf/tests/code-reading.c | |
parent | 8dc9abb93dde94e7f2bc719032fe16f5713df05c (diff) | |
parent | 98810a6dcf8af768d7b0b71e5075ff9c199f5196 (diff) |
Merge tag 'asoc-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.15
A smattering of driver-specific fixes here, nothing generic. The Cirrus
CODEC conversions to devm_ are leak fixes - the conversion adds missing
error handling code.
Diffstat (limited to 'tools/perf/tests/code-reading.c')
-rw-r--r-- | tools/perf/tests/code-reading.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 653a8fe2db9..bfb186900ac 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -504,6 +504,7 @@ static int do_test_code_reading(bool try_kcore) if (ret < 0) { if (!excl_kernel) { excl_kernel = true; + perf_evlist__set_maps(evlist, NULL, NULL); perf_evlist__delete(evlist); evlist = NULL; continue; |