diff options
| author | Josh Blum <josh@joshknows.com> | 2011-05-16 12:08:23 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-05-16 12:08:23 -0700 |
| commit | 22097e81dc54c895ed411c74c1829721e3a1ce5e (patch) | |
| tree | 8cc9ca6d8bb0432b9562fc19636eca3421b21100 /host/lib/usrp/usrp1/usrp1_impl.cpp | |
| parent | 13be023531fa1be8d43b999c3ea5ab477f101fdc (diff) | |
| parent | ea5ce50a465e714c63196f52df97fb3e927e701c (diff) | |
| download | uhd-22097e81dc54c895ed411c74c1829721e3a1ce5e.tar.gz uhd-22097e81dc54c895ed411c74c1829721e3a1ce5e.tar.bz2 uhd-22097e81dc54c895ed411c74c1829721e3a1ce5e.zip | |
Merge branch 'master' into release_work
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 57aae1b58..b1fa986d1 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -209,6 +209,8 @@ usrp1_impl::usrp1_impl(uhd::transport::usb_zero_copy::sptr data_transport, } usrp1_impl::~usrp1_impl(void){ + UHD_SAFE_CALL(this->enable_rx(false);) + UHD_SAFE_CALL(this->enable_tx(false);) //Safely destruct all RAII objects in a device. //This prevents the mboard deconstructor from throwing, //which allows the device to be safely deconstructed. |