summaryrefslogtreecommitdiff
path: root/gr-uhd/lib
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2015-05-27 09:48:26 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2015-05-27 09:48:26 -0700
commit7cbbe1d5fc326ea3f59615c95bc69dbcfda00824 (patch)
tree9c0d75d8d26f6ca5514991c2c4ce5dcd5c38d665 /gr-uhd/lib
parentef544fa173a9d0fcd9ac426d3cd8a2d762fb2fd6 (diff)
parentfb064e3c69cc7618da5c3d9c0dba2fecd84f1323 (diff)
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib')
-rw-r--r--gr-uhd/lib/usrp_block_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc
index 2e73b10538..c36898aab8 100644
--- a/gr-uhd/lib/usrp_block_impl.cc
+++ b/gr-uhd/lib/usrp_block_impl.cc
@@ -517,8 +517,8 @@ void usrp_block_impl::_update_curr_tune_req(::uhd::tune_request_t &tune_req, int
if (chan == -1) {
for (size_t i = 0; i < _nchan; i++) {
_update_curr_tune_req(tune_req, int(i));
- return;
}
+ return;
}
if (tune_req.target_freq != _curr_tune_req[chan].target_freq ||