From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752332AbcAEQy6 (ORCPT ); Tue, 5 Jan 2016 11:54:58 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:35178 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751982AbcAEQyq (ORCPT ); Tue, 5 Jan 2016 11:54:46 -0500 From: Peter Senna Tschudin To: thomas@winischhofer.net, gregkh@linuxfoundation.org, trivial@kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Peter Senna Tschudin , Peter Senna Tschudin Subject: [PATCH 5/5] usb-misc: sisusbvga: Remove null test before kfree() Date: Tue, 5 Jan 2016 17:54:10 +0100 Message-Id: <1452012850-6990-6-git-send-email-peter.senna@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452012850-6990-1-git-send-email-peter.senna@collabora.com> References: <1452012850-6990-1-git-send-email-peter.senna@collabora.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Senna Tschudin This patch removes null test before calls to kfree() as kfree() can handle null pointers safely. Signed-off-by: Peter Senna Tschudin --- Tested by compilation only. drivers/usb/misc/sisusbvga/sisusb.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index 875e365..8d0b29a 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c @@ -76,15 +76,11 @@ static void sisusb_free_buffers(struct sisusb_usb_data *sisusb) int i; for (i = 0; i < NUMOBUFS; i++) { - if (sisusb->obuf[i]) { - kfree(sisusb->obuf[i]); - sisusb->obuf[i] = NULL; - } - } - if (sisusb->ibuf) { - kfree(sisusb->ibuf); - sisusb->ibuf = NULL; + kfree(sisusb->obuf[i]); + sisusb->obuf[i] = NULL; } + kfree(sisusb->ibuf); + sisusb->ibuf = NULL; } static void sisusb_free_urbs(struct sisusb_usb_data *sisusb) -- 2.5.0