Merge branch 'master' into next

Conflicts:
	host/lib/usrp/usrp2/mboard_impl.cpp
	host/lib/usrp/usrp2/usrp2_impl.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index 082d77d3e..27a32d7a8 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -83,10 +83,10 @@ public:
      * \return false on timeout
      */
     UHD_INLINE bool check_fc_condition(seq_type seq, double timeout){
-        boost::this_thread::disable_interruption di; //disable because the wait can throw
         boost::unique_lock<boost::mutex> lock(_fc_mutex);
         _last_seq_out = seq;
         if (this->ready()) return true;
+        boost::this_thread::disable_interruption di; //disable because the wait can throw
         return _fc_cond.timed_wait(lock, to_time_dur(timeout), _ready_fcn);
     }