diff --git a/[refs] b/[refs] index bde6d1b07864..1b04e2ad580d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4de62748e69c31fc4fd5bc43b73e9cf60a17ec53 +refs/heads/master: 5d9881ea1440f046ee851bbaa2a2962543336a11 diff --git a/trunk/kernel/marker.c b/trunk/kernel/marker.c index 0f2a944329d3..2898b647d415 100644 --- a/trunk/kernel/marker.c +++ b/trunk/kernel/marker.c @@ -825,8 +825,6 @@ void *marker_get_private_data(const char *name, marker_probe_func *probe, if (!e->ptype) { if (num == 0 && e->single.func == probe) return e->single.probe_private; - else - break; } else { struct marker_probe_closure *closure; int match = 0; @@ -838,6 +836,7 @@ void *marker_get_private_data(const char *name, marker_probe_func *probe, return closure[i].probe_private; } } + break; } } return ERR_PTR(-ENOENT);