diff options
| author | Rickard Green <[email protected]> | 2013-02-14 17:39:29 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-02-14 17:39:29 +0100 |
| commit | 08dde65f70ef2b2218e9350bb4013b40aed65996 (patch) | |
| tree | e06948a48b99ab1a999eeb794a7dcd3604be58da /erts/emulator/beam/erl_async.c | |
| parent | 953dffbb4b1497f86004b9bc4e13bf9ed6cc2bed (diff) | |
| parent | 56b2a90c7c0e1d9c1e964ee324413d651a37e6e3 (diff) | |
| download | otp-08dde65f70ef2b2218e9350bb4013b40aed65996.tar.gz otp-08dde65f70ef2b2218e9350bb4013b40aed65996.tar.bz2 otp-08dde65f70ef2b2218e9350bb4013b40aed65996.zip | |
Merge branch 'rickard/r16b/port-optimizations-fixes/OTP-10809'
* rickard/r16b/port-optimizations-fixes/OTP-10809:
Add erl_drv_busy_msgq_limits() to driver API on Windows
Fix driver port accesses
Fix port exit
Diffstat (limited to 'erts/emulator/beam/erl_async.c')
| -rw-r--r-- | erts/emulator/beam/erl_async.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c index f2ca193ace..831e29d8a2 100644 --- a/erts/emulator/beam/erl_async.c +++ b/erts/emulator/beam/erl_async.c @@ -612,8 +612,8 @@ long driver_async(ErlDrvPort ix, unsigned int* key, sched_id = 1; #endif - prt = erts_drvport2port(ix, NULL); - if (!prt) + prt = erts_drvport2port(ix); + if (prt == ERTS_INVALID_ERL_DRV_PORT) return -1; ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt)); |