From 1557b293ef6e832f74052a5f76a787b1eaaef438 Mon Sep 17 00:00:00 2001 From: Syam Sidhardhan Date: Mon, 25 Feb 2013 03:35:43 +0530 Subject: [PATCH] --- yaml --- r: 368351 b: refs/heads/master c: cd3d03d596a4d8b31fcec40120472ea518d8232e h: refs/heads/master i: 368349: 7861a8c1f0e23dcab903e59a550dc2ddb6b6cdd7 368347: 85d7bda9269f9499c4ebc9ae47f5c2af31d43a25 368343: 2a09e2d5d352f190ca82aba4678dbd023121350e 368335: cb543c03fff0eafc1af7960a4cf01912f7a05856 368319: 99fe734ea327423df37e04e7ce34bd630354345e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rndis_wlan.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b5bbb5846239..bfbd5db23135 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7626cf19713464dbad96abba3f375771447925e6 +refs/heads/master: cd3d03d596a4d8b31fcec40120472ea518d8232e diff --git a/trunk/drivers/net/wireless/rndis_wlan.c b/trunk/drivers/net/wireless/rndis_wlan.c index 525fd7521dff..5f66b4eac298 100644 --- a/trunk/drivers/net/wireless/rndis_wlan.c +++ b/trunk/drivers/net/wireless/rndis_wlan.c @@ -2839,8 +2839,7 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev) } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC) cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL); - if (info != NULL) - kfree(info); + kfree(info); priv->connected = true; memcpy(priv->bssid, bssid, ETH_ALEN);