aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormcrymble <matthew.crymble@ni.com>2015-02-06 16:10:24 -0600
committermcrymble <matthew.crymble@ni.com>2015-02-06 16:10:24 -0600
commit1d1976c48e8ca698d9c35636823c8ea39dc69129 (patch)
treec4a3022c60d1d177370537395b2d865922925a76
parent38cfd24f7e4cbb4a6811ab6a41507a91e23bd748 (diff)
downloaduhd-1d1976c48e8ca698d9c35636823c8ea39dc69129.tar.gz
uhd-1d1976c48e8ca698d9c35636823c8ea39dc69129.tar.bz2
uhd-1d1976c48e8ca698d9c35636823c8ea39dc69129.zip
b200: Bugfix#692: b200_find now returns an empty device vector when hint contains addr0/resource0/etc style keys.
-rw-r--r--host/lib/usrp/b200/b200_impl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp
index 355d12d12..13169a5ed 100644
--- a/host/lib/usrp/b200/b200_impl.cpp
+++ b/host/lib/usrp/b200/b200_impl.cpp
@@ -86,7 +86,9 @@ static device_addrs_t b200_find(const device_addr_t &hint)
//Return an empty list of addresses when an address or resource is specified,
//since an address and resource is intended for a different, non-USB, device.
- if (hint.has_key("addr") || hint.has_key("resource")) return b200_addrs;
+ BOOST_FOREACH(device_addr_t hint_i, separate_device_addr(hint)) {
+ if (hint_i.has_key("addr") || hint_i.has_key("resource")) return b200_addrs;
+ }
boost::uint16_t vid, pid;