resolved conflicts for merge of 7d3085c6 to master

[android-x86/external-wpa_supplicant_6.git] / wpa_supplicant / src / drivers / driver_wext.c

diff --git a/wpa_supplicant/src/drivers/driver_wext.c b/wpa_supplicant/src/drivers/driver_wext.c
index d091a45..8c28c1a 100644 (file)
--- a/wpa_supplicant/src/drivers/driver_wext.c
+++ b/wpa_supplicant/src/drivers/driver_wext.c
@@ -1206,8 +1206,8 @@ int wpa_driver_wext_combo_scan(void *priv, struct wpa_ssid **ssid_ptr,
        int scan_probe_flag = 0;
 
        if (!drv->driver_is_started) {
-               wpa_printf(MSG_ERROR, "%s: Driver stopped", __func__);
-               return -1;
+               wpa_printf(MSG_DEBUG, "%s: Driver stopped", __func__);
+               return 0;
        }
 
        wpa_printf(MSG_ERROR, "%s: Start", __func__);