@@ -339,7 +339,7 @@ int dhd_idletime = DHD_IDLETIME_TICKS;
module_param(dhd_idletime, int, 0);
/* Use polling */
-uint dhd_poll = false;
+uint dhd_poll;
module_param(dhd_poll, uint, 0);
/* Use cfg80211 */
@@ -1817,9 +1817,12 @@ dhd_add_if(dhd_info_t *dhd, int ifidx, void *handle, char *name,
ASSERT(dhd && (ifidx < DHD_MAX_IFS));
ifp = dhd->iflist[ifidx];
- if (!ifp && !(ifp = kmalloc(sizeof(dhd_if_t), GFP_ATOMIC))) {
- DHD_ERROR(("%s: OOM - dhd_if_t\n", __func__));
- return -ENOMEM;
+ if (!ifp) {
+ ifp = kmalloc(sizeof(dhd_if_t), GFP_ATOMIC);
+ if (!ifp) {
+ DHD_ERROR(("%s: OOM - dhd_if_t\n", __func__));
+ return -ENOMEM;
+ }
}
memset(ifp, 0, sizeof(dhd_if_t));
@@ -323,9 +323,8 @@ static void wl_debugfs_remove_netdev(struct wl_priv *wl);
#define WL_PRIV_GET() \
({ \
- struct wl_iface *ci; \
- if (unlikely(!(wl_cfg80211_dev && \
- (ci = wl_get_drvdata(wl_cfg80211_dev))))) { \
+ struct wl_iface *ci = wl_get_drvdata(wl_cfg80211_dev); \
+ if (unlikely(!ci)) { \
WL_ERR("wl_cfg80211_dev is unavailable\n"); \
BUG(); \
} \
@@ -4298,7 +4297,11 @@ static void wl_set_drvdata(struct wl_dev *dev, void *data)
static void *wl_get_drvdata(struct wl_dev *dev)
{
- return dev->driver_data;
+ void *data = NULL;
+
+ if (dev)
+ data = dev->driver_data;
+ return data;
}
s32 wl_cfg80211_read_fw(s8 *buf, u32 size)
@@ -1172,7 +1172,7 @@ static int _iscan_sysioc_thread(void *data)
{
u32 status;
iscan_info_t *iscan = (iscan_info_t *) data;
- static bool iscan_pass_abort = false;
+ static bool iscan_pass_abort;
allow_signal(SIGTERM);
status = WL_SCAN_RESULTS_PARTIAL;