From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755268AbbGQOEO (ORCPT ); Fri, 17 Jul 2015 10:04:14 -0400 Received: from smtp21.openmailbox.org ([62.4.1.55]:57287 "EHLO smtp21.openmailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753103AbbGQOEM (ORCPT ); Fri, 17 Jul 2015 10:04:12 -0400 Authentication-Results: mail.openmailbox.org (amavisd-new); dkim=pass (1024-bit key) reason="pass (just generated, assumed good)" header.d=openmailbox.org From: Joseph-Eugene Winzer To: m999@openmailbox.org, gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] drivers: staging: rtl8192u: removed pointer check for kfree in r8192U_core.c Date: Fri, 17 Jul 2015 15:59:18 +0200 Message-Id: <1437141560-22517-3-git-send-email-m999@openmailbox.org> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1437141560-22517-1-git-send-email-m999@openmailbox.org> References: <1437141560-22517-1-git-send-email-m999@openmailbox.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kfree() can handle NULL pointers itself, so the check is unnecessary. Signed-off-by: Joseph-Eugene Winzer --- drivers/staging/rtl8192u/r8192U_core.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index 89b627f..34dc4af 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -1803,10 +1803,8 @@ static void rtl8192_usb_deleteendpoints(struct net_device *dev) } kfree(priv->oldaddr); priv->oldaddr = NULL; - if (priv->pp_rxskb) { - kfree(priv->pp_rxskb); - priv->pp_rxskb = NULL; - } + kfree(priv->pp_rxskb); + priv->pp_rxskb = NULL; } #else void rtl8192_usb_deleteendpoints(struct net_device *dev) @@ -1831,11 +1829,8 @@ void rtl8192_usb_deleteendpoints(struct net_device *dev) priv->rx_urb = NULL; kfree(priv->oldaddr); priv->oldaddr = NULL; - if (priv->pp_rxskb) { - kfree(priv->pp_rxskb); - priv->pp_rxskb = 0; - - } + kfree(priv->pp_rxskb); + priv->pp_rxskb = 0; #endif } -- 2.4.6