diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-30 17:11:46 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-30 17:11:46 -0700 |
| commit | 493ed897f24fff5265b766ee634916b002cadf94 (patch) | |
| tree | 09082fa8be0c71b92ca668083dd1519a452b679d /host/lib/transport | |
| parent | 7b509d6fe4ac4cfcafc63f11f5b298d3e0237acd (diff) | |
| parent | 1e57d1c0496ca6263652cd84c9eeacafde833915 (diff) | |
| download | uhd-493ed897f24fff5265b766ee634916b002cadf94.tar.gz uhd-493ed897f24fff5265b766ee634916b002cadf94.tar.bz2 uhd-493ed897f24fff5265b766ee634916b002cadf94.zip | |
Merge branch 'master' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_regs.cpp
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/libusb1_zero_copy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/transport/libusb1_zero_copy.cpp b/host/lib/transport/libusb1_zero_copy.cpp index e42cab1d1..ec2077d30 100644 --- a/host/lib/transport/libusb1_zero_copy.cpp +++ b/host/lib/transport/libusb1_zero_copy.cpp @@ -277,10 +277,10 @@ private: bool _threads_running; void run_event_loop(boost::barrier &spawn_barrier){ + _threads_running = true; spawn_barrier.wait(); set_thread_priority_safe(); libusb_context *context = libusb::session::get_global_session()->get_context(); - _threads_running = true; try{ while(_threads_running){ timeval tv; |