2013-02-24 22:05:58

by Syam Sidhardhan

Subject: [PATCH] rndis_wlan: Remove redundant NULL check before kfree

kfree on a NULL pointer is a no-op.

Signed-off-by: Syam Sidhardhan <[email protected]>
---
drivers/net/wireless/rndis_wlan.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 525fd75..5f66b4e 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/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);
--
1.7.9.5

2013-02-25 10:02:08

by Jussi Kivilinna

Subject: Re: [PATCH] rndis_wlan: Remove redundant NULL check before kfree

Acked-by: Jussi Kivilinna <[email protected]>

Quoting Syam Sidhardhan <[email protected]>:

> kfree on a NULL pointer is a no-op.
>
> Signed-off-by: Syam Sidhardhan <[email protected]>
> ---
> drivers/net/wireless/rndis_wlan.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/rndis_wlan.c
> b/drivers/net/wireless/rndis_wlan.c
> index 525fd75..5f66b4e 100644
> --- a/drivers/net/wireless/rndis_wlan.c
> +++ b/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);
> --
> 1.7.9.5
>
>
>