diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-02-10 16:41:50 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-02-10 16:41:50 -0800 |
| commit | cc769d1b532df2c636edca0bda951b3c5e919de2 (patch) | |
| tree | 40322d9dbb0875e7fcd888aa375b2c7a6c5feb39 /host/lib/usrp/x300 | |
| parent | 0e7c61ec6818232ffcb68b79e54d8ffbe7431d75 (diff) | |
| parent | d5d3e5a7cc4a8a5cbb1685f2e00d6301a9a9781f (diff) | |
| download | uhd-cc769d1b532df2c636edca0bda951b3c5e919de2.tar.gz uhd-cc769d1b532df2c636edca0bda951b3c5e919de2.tar.bz2 uhd-cc769d1b532df2c636edca0bda951b3c5e919de2.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/x300')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index aa54c2228..edf254130 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -1072,7 +1072,9 @@ x300_impl::~x300_impl(void) release(mb.zpu_ctrl); //If the process is killed, the entire registry will disappear so we //don't need to worry about unclean shutdowns here. - get_pcie_zpu_iface_registry().pop(mb.get_pri_eth().addr); + if (get_pcie_zpu_iface_registry().has_key(mb.get_pri_eth().addr)) { + get_pcie_zpu_iface_registry().pop(mb.get_pri_eth().addr); + } } } } |