diff --git a/lib/sink_impl.cc b/lib/sink_impl.cc
index 94a7f33..3f4db4b 100644
--- a/lib/sink_impl.cc
+++ b/lib/sink_impl.cc
@@ -503,7 +503,7 @@ void sink_impl::set_dc_offset( const std::complex<double> &offset, size_t chan )
   BOOST_FOREACH( sink_iface *dev, _devs )
     for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++)
       if ( chan == channel++ )
-        return dev->set_dc_offset( offset, dev_chan );
+        dev->set_dc_offset( offset, dev_chan );
 }
 
 void sink_impl::set_iq_balance( const std::complex<double> &balance, size_t chan )
@@ -512,7 +512,7 @@ void sink_impl::set_iq_balance( const std::complex<double> &balance, size_t chan
   BOOST_FOREACH( sink_iface *dev, _devs )
     for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++)
       if ( chan == channel++ )
-        return dev->set_iq_balance( balance, dev_chan );
+        dev->set_iq_balance( balance, dev_chan );
 }
 
 double sink_impl::set_bandwidth( double bandwidth, size_t chan )
diff --git a/lib/source_impl.cc b/lib/source_impl.cc
index 5584d01..9f03c39 100644
--- a/lib/source_impl.cc
+++ b/lib/source_impl.cc
@@ -684,7 +684,7 @@ void source_impl::set_dc_offset_mode( int mode, size_t chan )
   BOOST_FOREACH( source_iface *dev, _devs )
     for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++)
       if ( chan == channel++ )
-        return dev->set_dc_offset_mode( mode, dev_chan );
+        dev->set_dc_offset_mode( mode, dev_chan );
 }
 
 void source_impl::set_dc_offset( const std::complex<double> &offset, size_t chan )
@@ -693,7 +693,7 @@ void source_impl::set_dc_offset( const std::complex<double> &offset, size_t chan
   BOOST_FOREACH( source_iface *dev, _devs )
     for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++)
       if ( chan == channel++ )
-        return dev->set_dc_offset( offset, dev_chan );
+        dev->set_dc_offset( offset, dev_chan );
 }
 
 void source_impl::set_iq_balance_mode( int mode, size_t chan )