diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:25 +0800 |
| commit | a759573d34fc8249c416857e15cf8d0fd9c99d1a (patch) | |
| tree | cb2d530d42301f84382686fd343f71223e9af157 /kernel/trace/trace_selftest.c | |
| parent | eebd4781fb3bb7b47568d8747d97d269d2649ec9 (diff) | |
| parent | cda2b9481445e798669f00fb8275d595f1ff943f (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-17.09-android
Diffstat (limited to 'kernel/trace/trace_selftest.c')
| -rw-r--r-- | kernel/trace/trace_selftest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index b0f86ea77881..ca70d11b8aa7 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c @@ -272,7 +272,7 @@ static int trace_selftest_ops(struct trace_array *tr, int cnt) goto out_free; if (cnt > 1) { if (trace_selftest_test_global_cnt == 0) - goto out; + goto out_free; } if (trace_selftest_test_dyn_cnt == 0) goto out_free; |