Merge branch 'usrp_e' into usrp_e_next

2 files changed, 4 insertions, 4 deletions

diff --git a/host/examples/ascii_art_dft.hpp b/host/examples/ascii_art_dft.hpp
index ee2267c2d..92fb77596 100644
--- a/host/examples/ascii_art_dft.hpp
+++ b/host/examples/ascii_art_dft.hpp
@@ -28,7 +28,7 @@ namespace acsii_art_dft{
     );
 
     /*!
-     * Convert a DFT to a piroundable ascii plot.
+     * Convert a DFT to a printable ascii plot.
      * \param dft the log power dft bins
      * \param width the frame width in characters
      * \param height the frame height in characters
diff --git a/host/lib/usrp/misc_utils.cpp b/host/lib/usrp/misc_utils.cpp
index 7e49baa52..5856d706f 100644
--- a/host/lib/usrp/misc_utils.cpp
+++ b/host/lib/usrp/misc_utils.cpp
@@ -164,13 +164,13 @@ static void verify_xx_subdev_spec(
         }
 
         //sanity check that the dboard/subdevice names exist for this mboard
-        BOOST_FOREACH(const subdev_spec_pair_t &pair, subdev_spec){
+        BOOST_FOREACH(subdev_spec_pair_t &pair, subdev_spec){
             //empty db name means select dboard automatically
             if (pair.db_name.empty()){
                 if (dboard_names.size() != 1) throw std::runtime_error(
                     "A daughterboard name must be provided for multi-slot motherboards: " + subdev_spec.to_string()
                 );
-                pair.db_name == dboard_names.front();
+                pair.db_name = dboard_names.front();
             }
             uhd::assert_has(dboard_names, pair.db_name, xx_type + " dboard name");
             wax::obj dboard = mboard[named_prop_t(dboard_prop, pair.db_name)];
@@ -181,7 +181,7 @@ static void verify_xx_subdev_spec(
                 if (subdev_names.size() != 1) throw std::runtime_error(
                     "A subdevice name must be provided for multi-subdev daughterboards: " + subdev_spec.to_string()
                 );
-                pair.sd_name == subdev_names.front();
+                pair.sd_name = subdev_names.front();
             }
             uhd::assert_has(subdev_names, pair.sd_name, xx_type + " subdev name");
         }