Просмотр исходного кода

Merge "qcacld-3.0: Check for adapter validity in IPA deinit" into wlan-cld3.driver.lnx.2.0-dev

Service qcabuildsw 8 лет назад
Родитель
Сommit
1e24247c88
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      core/hdd/src/wlan_hdd_ipa.c

+ 3 - 2
core/hdd/src/wlan_hdd_ipa.c

@@ -2734,10 +2734,11 @@ static int __hdd_ipa_uc_ssr_deinit(void)
 	for (idx = 0; (hdd_ipa->num_iface > 0) &&
 		(idx < HDD_IPA_MAX_IFACE); idx++) {
 		iface_context = &hdd_ipa->iface_context[idx];
-		if (iface_context && iface_context->adapter)
+		if (iface_context->adapter && iface_context->adapter->magic ==
+					      WLAN_HDD_ADAPTER_MAGIC)
 			hdd_ipa_cleanup_iface(iface_context);
 	}
-
+	hdd_ipa->num_iface = 0;
 	/* After SSR, wlan driver reloads FW again. But we need to protect
 	 * IPA submodule during SSR transient state. So deinit basic IPA
 	 * UC host side to be in sync with reloaded FW during SSR