2 files changed, 13 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp
index 8beeccf8f..b3268298e 100644
--- a/host/lib/usrp/usrp1/io_impl.cpp
+++ b/host/lib/usrp/usrp1/io_impl.cpp
@@ -18,6 +18,7 @@
 #include "../../transport/vrt_packet_handler.hpp"
 #include "usrp_commands.h"
 #include "usrp1_impl.hpp"
+#include <uhd/utils/safe_call.hpp>
 #include <uhd/utils/thread_priority.hpp>
 #include <uhd/transport/bounded_buffer.hpp>
 #include <boost/bind.hpp>
@@ -114,7 +115,7 @@ struct usrp1_impl::io_impl{
     }
 
     ~io_impl(void){
-        flush_send_buff();
+        UHD_SAFE_CALL(flush_send_buff();)
     }
 
     zero_copy_if::sptr data_transport;
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp
index caea7c043..7005c59f2 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.cpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.cpp
@@ -19,6 +19,7 @@
 #include "usrp1_ctrl.hpp"
 #include "fpga_regs_standard.h"
 #include "usrp_spi_defs.h"
+#include <uhd/utils/safe_call.hpp>
 #include <uhd/transport/usb_control.hpp>
 #include <uhd/usrp/device_props.hpp>
 #include <uhd/usrp/mboard_props.hpp>
@@ -199,7 +200,16 @@ usrp1_impl::usrp1_impl(uhd::transport::usb_zero_copy::sptr data_transport,
 }
 
 usrp1_impl::~usrp1_impl(void){
-    /* NOP */
+    //Safely destruct all RAII objects in a device.
+    //This prevents the mboard deconstructor from throwing,
+    //which allows the device to be safely deconstructed.
+    BOOST_FOREACH(dboard_slot_t slot, _dboard_slots){
+        UHD_SAFE_CALL(_dboard_managers[slot].reset();)
+        UHD_SAFE_CALL(_dboard_ifaces[slot].reset();)
+        UHD_SAFE_CALL(_codec_ctrls[slot].reset();)
+    }
+    UHD_SAFE_CALL(_clock_ctrl.reset();)
+    UHD_SAFE_CALL(_io_impl.reset();)
 }
 
 bool usrp1_impl::recv_async_msg(uhd::async_metadata_t &, double timeout){