diff options
author | Rickard Green <[email protected]> | 2016-05-11 17:16:27 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2016-05-11 17:16:27 +0200 |
commit | 18fbb49321d716d4590d24512696b665e857d623 (patch) | |
tree | 24d0c78cec3abc0c7466ecbba5385d19ee750b53 /erts/emulator/beam/io.c | |
parent | 8b544b523d915d1a54d505ec34182676f183a5e0 (diff) | |
parent | 3471d44a6a5ed5ab038c4cdc76b350119fe745e2 (diff) | |
download | otp-18fbb49321d716d4590d24512696b665e857d623.tar.gz otp-18fbb49321d716d4590d24512696b665e857d623.tar.bz2 otp-18fbb49321d716d4590d24512696b665e857d623.zip |
Merge branch 'lukas/trace-fix'
* lukas/trace-fix:
erts: Only allow remove from trace_status callback
Diffstat (limited to 'erts/emulator/beam/io.c')
-rw-r--r-- | erts/emulator/beam/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index ef326fafec..0377f6cb5e 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -5941,7 +5941,7 @@ driver_deliver_term(Port *prt, Eterm to, ErlDrvTermData* data, int len) if (!rp) { if (!prt || !IS_TRACED_FL(prt, F_TRACE_SEND)) goto done; - if (!erts_is_tracer_proc_enabled(NULL, 0, &prt->common, am_send)) + if (!erts_is_tracer_proc_enabled_send(NULL, 0, &prt->common)) goto done; res = -2; |