Fix combo-scan prev SSID pointer update in case of scan failure

Change-Id: Ia3d302ade71d558f4749177a522e08b768f20735
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index beec16e..27fc84a 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1493,10 +1493,8 @@ int wpa_drv_scan(struct wpa_supplicant *wpa_s, struct wpa_ssid **ssid_ptr)
        if (wpa_s->driver->combo_scan) {
                ret = wpa_s->driver->combo_scan(wpa_s->drv_priv, ssid_ptr,
                                                wpa_s->conf->ssid);
-               if (!ret) {
-                       wpa_s->prev_scan_ssid = (*ssid_ptr) ?
-                                       (*ssid_ptr) : BROADCAST_SSID_SCAN;
-               }
+               wpa_s->prev_scan_ssid = (*ssid_ptr && !ret) ?
+                               (*ssid_ptr) : BROADCAST_SSID_SCAN;
        }
        else if (wpa_s->driver->scan) {
                if (*ssid_ptr) {