diff options
author | 2020-12-28 14:20:00 +0000 | |
---|---|---|
committer | 2020-12-28 14:20:00 +0000 | |
commit | 2ae6f64ce1ce304b502461fdfe0b96c8171ae2cc (patch) | |
tree | 88e987c447daf2c29e2d4c15e58d1029b0cc78c2 /kernel/trace/synth_event_gen_test.c | |
parent | regulator: bd718x7: Add enable times (diff) | |
parent | Linux 5.11-rc1 (diff) | |
download | linux-dev-2ae6f64ce1ce304b502461fdfe0b96c8171ae2cc.tar.xz linux-dev-2ae6f64ce1ce304b502461fdfe0b96c8171ae2cc.zip |
Merge tag 'v5.11-rc1' into regulator-5.11
Linux 5.11-rc1
Diffstat (limited to 'kernel/trace/synth_event_gen_test.c')
-rw-r--r-- | kernel/trace/synth_event_gen_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/synth_event_gen_test.c b/kernel/trace/synth_event_gen_test.c index edd912cd14aa..a4b4bbf8c3bf 100644 --- a/kernel/trace/synth_event_gen_test.c +++ b/kernel/trace/synth_event_gen_test.c @@ -307,7 +307,7 @@ static int __init test_create_synth_event(void) return ret; delete: /* We got an error after creating the event, delete it */ - ret = synth_event_delete("create_synth_test"); + synth_event_delete("create_synth_test"); goto out; } |