diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-09-01 15:20:42 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-09-01 15:20:42 -0700 |
| commit | 6464a000150858b5d65a53490f0593d5ba1e4ca6 (patch) | |
| tree | a199c3773d683d9e37fa300900291c3628cff6e4 /host/lib/transport | |
| parent | d697bff4547b6a7fb95e127ec12e2989fc6fc2e5 (diff) | |
| parent | 8adefb1d80f08a53856fef45b80ed5a07f0a9a26 (diff) | |
| download | uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.tar.gz uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.tar.bz2 uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/nirio/nirio_driver_iface_win.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/host/lib/transport/nirio/nirio_driver_iface_win.cpp b/host/lib/transport/nirio/nirio_driver_iface_win.cpp index b47c6ce85..717923176 100644 --- a/host/lib/transport/nirio/nirio_driver_iface_win.cpp +++ b/host/lib/transport/nirio/nirio_driver_iface_win.cpp @@ -1,5 +1,5 @@ // -// Copyright 2013 Ettus Research LLC +// Copyright 2013,2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -60,14 +60,13 @@ nirio_status rio_ioctl( * DeviceIoControl, even when doing synchronous IO. */ OVERLAPPED zeroedOverlapped = {0}; DWORD outLen = 0; - int_fast32_t lastError = 0; if (!(DeviceIoControl(device_handle, ioctl_code, const_cast<void*>(write_buf), static_cast<DWORD>(write_buf_len), read_buf, static_cast<DWORD>(read_buf_len), &outLen, &zeroedOverlapped ))) { - lastError = GetLastError(); + int_fast32_t lastError = GetLastError(); return NiRio_Status_SoftwareFault; } |