Merge with temp tree to get David's gdb inferior calls patch

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index c456dc81b873..3b377f6cd4a0 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -2467,14 +2467,10 @@ static void ppp_destroy_interface(struct ppp *ppp)
         skb_queue_purge(&ppp->mrq);
 #endif /* CONFIG_PPP_MULTILINK */
 #ifdef CONFIG_PPP_FILTER
-        if (ppp->pass_filter) {
-                kfree(ppp->pass_filter);
-                ppp->pass_filter = NULL;
-        }
-        if (ppp->active_filter) {
-                kfree(ppp->active_filter);
-                ppp->active_filter = NULL;
-        }
+        kfree(ppp->pass_filter);
+        ppp->pass_filter = NULL;
+        kfree(ppp->active_filter);
+        ppp->active_filter = NULL;
 #endif /* CONFIG_PPP_FILTER */
 
         kfree(ppp);