aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrej Rode <andrej.rode@ettus.com>2017-01-31 17:32:53 -0800
committerMartin Braun <martin.braun@ettus.com>2017-02-01 10:12:40 +0100
commita8a638d5f848f20b1cce1fa3456a0671e9a0675f (patch)
tree2264a141516543aa93f31474603336acd885edf6
parent75e6ae59b3f4832372c08d7da390c5fdcc283067 (diff)
downloaduhd-a8a638d5f848f20b1cce1fa3456a0671e9a0675f.tar.gz
uhd-a8a638d5f848f20b1cce1fa3456a0671e9a0675f.tar.bz2
uhd-a8a638d5f848f20b1cce1fa3456a0671e9a0675f.zip
x300: only remove existing items from zpu_iface_registry in destructor
-rw-r--r--host/lib/usrp/x300/x300_impl.cpp4
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 028058a58..374247fea 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -1022,7 +1022,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);
+ }
}
}
}