Merge pull request #12098 from ARMmbed/AnttiKauppila-patch-1

adbridge · web-flow · commit 03e29df0c47a · 2019-12-17T16:26:40.000Z
Wrong order of code fixed
diff --git a/components/wifi/esp8266-driver/ESP8266Interface.cpp b/components/wifi/esp8266-driver/ESP8266Interface.cpp
@@ -637,10 +637,10 @@ int ESP8266Interface::scan(WiFiAccessPoint *res, unsigned count, scan_mode mode,
 
     nsapi_error_t status = _init();
     if (status != NSAPI_ERROR_OK) {
-        return status;
         if (_software_conn_stat == IFACE_STATUS_DISCONNECTED) {
             _esp.uart_enable_input(false);
         }
+        return status;
     }
 
     int ret = _esp.scan(res, count, (mode == SCANMODE_ACTIVE ? ESP8266::SCANMODE_ACTIVE : ESP8266::SCANMODE_PASSIVE),

Original file line number	Diff line number	Diff line change
`@@ -637,10 +637,10 @@ int ESP8266Interface::scan(WiFiAccessPoint *res, unsigned count, scan_mode mode,`
`637`	`637`
`638`	`638`	`nsapi_error_t status = _init();`
`639`	`639`	`if (status != NSAPI_ERROR_OK) {`
`640`		`- return status;`
`641`	`640`	`if (_software_conn_stat == IFACE_STATUS_DISCONNECTED) {`
`642`	`641`	`_esp.uart_enable_input(false);`
`643`	`642`	`}`
	`643`	`+ return status;`
`644`	`644`	`}`
`645`	`645`
`646`	`646`	`int ret = _esp.scan(res, count, (mode == SCANMODE_ACTIVE ? ESP8266::SCANMODE_ACTIVE : ESP8266::SCANMODE_PASSIVE),`