diff options
author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-04-21 16:34:44 -0700 |
---|---|---|
committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-04-21 16:34:44 -0700 |
commit | 75c922ae0468363cc9e215a66763c7c4e396a13f (patch) | |
tree | 1ee8dc432a91134ed83f1f4688f5547365269572 | |
parent | b0267efa30e1d460f9831094a955355aca3b812e (diff) | |
parent | 996224242aca2362e25eb812d261875aa9f30b68 (diff) | |
download | uhd-75c922ae0468363cc9e215a66763c7c4e396a13f.tar.gz uhd-75c922ae0468363cc9e215a66763c7c4e396a13f.tar.bz2 uhd-75c922ae0468363cc9e215a66763c7c4e396a13f.zip |
Merge branch 'maint'
-rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 4883b2410..166b0cb37 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -1196,7 +1196,7 @@ private: // Assumption is that all mboards use the same link bool _check_link_rate(const stream_args_t &args, bool is_tx) { bool link_rate_is_ok = true; - size_t bytes_per_sample = convert::get_bytes_per_item(args.otw_format); + size_t bytes_per_sample = convert::get_bytes_per_item(args.otw_format.empty() ? "sc16" : args.otw_format); double max_link_rate = 0; double sum_rate = 0; BOOST_FOREACH(const size_t chan, args.channels) { |