1 files changed, 4 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index 079f096cb..df98ba275 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -314,8 +314,10 @@ void usrp2_mboard_impl::set(const wax::obj &key, const wax::obj &val){
         return;
 
     case MBOARD_PROP_EEPROM_MAP:
-        _iface->mb_eeprom = val.as<mboard_eeprom_t>();
-        _iface->mb_eeprom.commit(*_iface, mboard_eeprom_t::MAP_NXXX);
+        // Step1: commit the map, writing only those values set.
+        // Step2: readback the entire eeprom map into the iface.
+        val.as<mboard_eeprom_t>().commit(*_iface, mboard_eeprom_t::MAP_NXXX);
+        _iface->mb_eeprom = mboard_eeprom_t(*_iface, mboard_eeprom_t::MAP_NXXX);
         return;
 
     default: UHD_THROW_PROP_SET_ERROR();