From 9afaef18bfc9692047bfd4ee2ba296803aa3db04 Mon Sep 17 00:00:00 2001 From: Pavankumar Nandeshwar Date: Wed, 11 Mar 2020 11:08:11 +0530 Subject: [PATCH] qcacmn: Assign soc to dp_pdev soon after allocation Assign soc to dp_pdev soon after allocation, since the soc pointer is required during deinit if pdev attach fails. Change-Id: I87789deb82efe9f554b3310a904dd340c5eb9f7a CRs-fixed: 2638378 --- dp/wifi3.0/dp_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index ecb1b15dd2..57187cecbc 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -3622,6 +3622,8 @@ static inline QDF_STATUS dp_pdev_attach_wifi3(struct cdp_soc_t *txrx_soc, ret = QDF_STATUS_E_NOMEM; goto fail0; } + pdev->soc = soc; + pdev->pdev_id = pdev_id; pdev->filter = dp_mon_filter_alloc(pdev); if (!pdev->filter) { @@ -3669,8 +3671,6 @@ static inline QDF_STATUS dp_pdev_attach_wifi3(struct cdp_soc_t *txrx_soc, wlan_cfg_set_dp_pdev_nss_enabled(pdev->wlan_cfg_ctx, (nss_cfg & (1 << pdev_id))); - pdev->soc = soc; - pdev->pdev_id = pdev_id; soc->pdev_list[pdev_id] = pdev; pdev->lmac_id = wlan_cfg_get_hw_mac_idx(soc->wlan_cfg_ctx, pdev_id);