提交 96edf83c 编写于 作者: J Jesper Juhl 提交者: David S. Miller

[PPP]: remove redundant NULL pointer checks before kfree & vfree

kfree() and vfree() can both deal with NULL pointers. This patch removes 
redundant NULL pointer checks from the ppp code in drivers/net/
Signed-off-by: NJesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 c3924c70
...@@ -87,8 +87,7 @@ static void z_comp_free(void *arg) ...@@ -87,8 +87,7 @@ static void z_comp_free(void *arg)
if (state) { if (state) {
zlib_deflateEnd(&state->strm); zlib_deflateEnd(&state->strm);
if (state->strm.workspace) vfree(state->strm.workspace);
vfree(state->strm.workspace);
kfree(state); kfree(state);
} }
} }
...@@ -308,8 +307,7 @@ static void z_decomp_free(void *arg) ...@@ -308,8 +307,7 @@ static void z_decomp_free(void *arg)
if (state) { if (state) {
zlib_inflateEnd(&state->strm); zlib_inflateEnd(&state->strm);
if (state->strm.workspace) kfree(state->strm.workspace);
kfree(state->strm.workspace);
kfree(state); kfree(state);
} }
} }
......
...@@ -2467,14 +2467,10 @@ static void ppp_destroy_interface(struct ppp *ppp) ...@@ -2467,14 +2467,10 @@ static void ppp_destroy_interface(struct ppp *ppp)
skb_queue_purge(&ppp->mrq); skb_queue_purge(&ppp->mrq);
#endif /* CONFIG_PPP_MULTILINK */ #endif /* CONFIG_PPP_MULTILINK */
#ifdef CONFIG_PPP_FILTER #ifdef CONFIG_PPP_FILTER
if (ppp->pass_filter) { kfree(ppp->pass_filter);
kfree(ppp->pass_filter); ppp->pass_filter = NULL;
ppp->pass_filter = NULL; kfree(ppp->active_filter);
} ppp->active_filter = NULL;
if (ppp->active_filter) {
kfree(ppp->active_filter);
ppp->active_filter = NULL;
}
#endif /* CONFIG_PPP_FILTER */ #endif /* CONFIG_PPP_FILTER */
kfree(ppp); kfree(ppp);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册