samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "qcacld-3.0: Check for NULL adapter returned from open_interface" into wlan-cld3.driver.lnx.1.1-dev

Browse Source
This commit is contained in:
Service qcabuildsw
2016-07-21 15:31:00 -07:00
committed by Gerrit - the friendly Code Review server
parent 0ef04dd62f b86f626030
commit 5517289868
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/hdd/src/wlan_hdd_main.c
View File

@@ -6001,9 +6001,15 @@ static inline int hdd_open_p2p_interface(struct hdd_context_t *hdd_ctx,
static hdd_adapter_t *hdd_open_monitor_interface(hdd_context_t *hdd_ctx,
bool rtnl_held)
{
return hdd_open_adapter(hdd_ctx, QDF_MONITOR_MODE, "wlan%d",
hdd_adapter_t *adapter;
adapter = hdd_open_adapter(hdd_ctx, QDF_MONITOR_MODE, "wlan%d",
wlan_hdd_get_intf_addr(hdd_ctx),
NET_NAME_UNKNOWN, rtnl_held);
if (adapter == NULL)
return ERR_PTR(-ENOSPC);
return adapter;
}
/**
@@ -6648,6 +6654,8 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
adapter = hdd_open_interfaces(hdd_ctx, rtnl_held);
if (IS_ERR(adapter)) {
hddLog(QDF_TRACE_LEVEL_FATAL,
FL("Failed to open interface, adapter is NULL"));
ret = PTR_ERR(adapter);
goto err_cds_disable;
}