commit ba982a0d7414f9c34a2be89ebc861a4220f731b3
author android-build-team Robot <android-build-team-robot@google.com> Thu Apr 08 00:28:46 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Apr 08 00:28:46 2021 +0000
tree 001378b49619c3daa6cec29b4d38182bc9313273
parent 7b9034df875033f6fbed8e469561ec93b0dd8293
parent fc5f237fcfcb26979d81e7710c2a358e555d7789

Snap for 7266504 from fc5f237fcfcb26979d81e7710c2a358e555d7789 to mainline-captiveportallogin-release

Change-Id: I879d9229cf07af7c4f79fe2460e7851a3e470f1d

src/p2p/p2p_pd.c

diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
index 3994ec0..05fd593 100644
--- a/src/p2p/p2p_pd.c
+++ b/src/p2p/p2p_pd.c
@@ -595,14 +595,12 @@
 			goto out;
 		}
 
+		dev = p2p_get_device(p2p, sa);
 		if (!dev) {
-			dev = p2p_get_device(p2p, sa);
-			if (!dev) {
-				p2p_dbg(p2p,
-					"Provision Discovery device not found "
-					MACSTR, MAC2STR(sa));
-				goto out;
-			}
+			p2p_dbg(p2p,
+				"Provision Discovery device not found "
+				MACSTR, MAC2STR(sa));
+			goto out;
 		}
 	} else if (msg.wfd_subelems) {
 		wpabuf_free(dev->info.wfd_subelems);