Merge tag 'backlight-next-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...

[linux.git] / kernel / trace / trace_dynevent.c

diff --git a/kernel/trace/trace_dynevent.c b/kernel/trace/trace_dynevent.c
index fa100ed3b4de9d128cd05215c972828ee13fbb26..a41fed46c285c3f83726b184b723b4a9e3dd772b 100644 (file)
--- a/kernel/trace/trace_dynevent.c
+++ b/kernel/trace/trace_dynevent.c
@@ -47,6 +47,7 @@ int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type)
                        return -EINVAL;
                event++;
        }
+       argc--; argv++;
 
        p = strchr(event, '/');
        if (p) {
@@ -61,10 +62,13 @@ int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type)
        for_each_dyn_event_safe(pos, n) {
                if (type && type != pos->ops)
                        continue;
-               if (pos->ops->match(system, event, pos)) {
-                       ret = pos->ops->free(pos);
+               if (!pos->ops->match(system, event,
+                               argc, (const char **)argv, pos))
+                       continue;
+
+               ret = pos->ops->free(pos);
+               if (ret)
                        break;
-               }
        }
        mutex_unlock(&event_mutex);