mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-14 08:36:12 -04:00
Merge "qcacld-3.0: Move cds_config cleanup into start modules" into wlan-cld3.driver.lnx.2.0-dev
This commit is contained in:
commit
ba968bf99e
1 changed files with 6 additions and 5 deletions
|
|
@ -2370,10 +2370,10 @@ int hdd_wlan_start_modules(struct hdd_context *hdd_ctx,
|
|||
hdd_update_cds_ac_specs_params(hdd_ctx);
|
||||
|
||||
status = cds_open(hdd_ctx->hdd_psoc);
|
||||
if (!QDF_IS_STATUS_SUCCESS(status)) {
|
||||
if (QDF_IS_STATUS_ERROR(status)) {
|
||||
hdd_err("Failed to Open CDS: %d", status);
|
||||
ret = (status == QDF_STATUS_E_NOMEM) ? -ENOMEM : -EINVAL;
|
||||
goto cds_free;
|
||||
ret = qdf_status_to_os_return(status);
|
||||
goto deinit_config;
|
||||
}
|
||||
|
||||
/* initalize components configurations after psoc open */
|
||||
|
|
@ -2468,6 +2468,9 @@ close:
|
|||
hdd_ctx->driver_status = DRIVER_MODULES_CLOSED;
|
||||
cds_close(hdd_ctx->hdd_psoc);
|
||||
|
||||
deinit_config:
|
||||
cds_deinit_ini_config();
|
||||
|
||||
cds_free:
|
||||
ol_cds_free();
|
||||
|
||||
|
|
@ -9950,8 +9953,6 @@ err_hdd_free_psoc:
|
|||
hdd_request_manager_deinit();
|
||||
hdd_exit_netlink_services(hdd_ctx);
|
||||
|
||||
cds_deinit_ini_config();
|
||||
|
||||
hdd_objmgr_release_and_destroy_psoc(hdd_ctx);
|
||||
|
||||
err_hdd_free_context:
|
||||
|
|
|
|||
Loading…
Reference in a new issue