PD #85790: add null pointer protect for p2p interface close
authorLarson Jiang <larson.jiang@amlogic.com>
Tue, 7 Jan 2014 10:56:15 +0000 (18:56 +0800)
committerLarson Jiang <larson.jiang@amlogic.com>
Wed, 8 Jan 2014 06:37:33 +0000 (14:37 +0800)
broadcm_40181/wl_cfgp2p.c

index a8906138be3d0f09d05f086590548d12d04c3ec8..e19504f5e2f5ff2e22f373f8996ec346009d68d7 100755 (executable)
@@ -1615,7 +1615,7 @@ wl_cfgp2p_cancel_listen(struct wl_priv *wl, struct net_device *ndev,
        if (timer_pending(&wl->p2p->listen_timer)) {
                del_timer_sync(&wl->p2p->listen_timer);
                if (notify)
-                       if (ndev && ndev->ieee80211_ptr) {
+                       if (ndev && ndev->ieee80211_ptr && wdev) {
 #if defined(WL_CFG80211_P2P_DEV_IF)
                                cfg80211_remain_on_channel_expired(wdev, wl->last_roc_id,
                                        &wl->remain_on_chan, GFP_KERNEL);