Merge cherrypicks of [14129455, 14130265, 14129457, 14130197, 14130199, 14130200, 14130201, 14130203, 14129438, 14129439, 14129732, 14129441, 14130241, 14129733, 14129734, 14130308, 14130309, 14130310, 14130312] into security-aosp-qt-release
Change-Id: I5d12de6aee898413b0c627bf3e9a8ba119dc888a
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);