Merge branch 'master' of https://github.com/ConradBraam/mbed-os into dev_rollup

0xc0170 · 0xc0170 · commit 48569e1cf72c · 2018-11-15T14:04:41.000Z
diff --git a/features/nfc/source/nfc/NFCEEPROM.cpp b/features/nfc/source/nfc/NFCEEPROM.cpp
@@ -115,7 +115,7 @@ void NFCEEPROM::erase_ndef_message()
         return;
     }
 
-    _current_op = nfc_eeprom_read_start_session;
+    _current_op = nfc_eeprom_erase_start_session;
 
     // Reset EEPROM address
     _eeprom_address = 0;

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void NFCEEPROM::erase_ndef_message()`
`115`	`115`	`return;`
`116`	`116`	`}`
`117`	`117`
`118`		`- _current_op = nfc_eeprom_read_start_session;`
	`118`	`+ _current_op = nfc_eeprom_erase_start_session;`
`119`	`119`
`120`	`120`	`// Reset EEPROM address`
`121`	`121`	`_eeprom_address = 0;`