Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1310326

[PATCH V2 5/7] usb-misc: sisusbvga: Remove null test before calls to kfree()

From Peter Senna Tschudin <peter.senna@collabora.com>
Newsgroups linux.kernel
Subject [PATCH V2 5/7] usb-misc: sisusbvga: Remove null test before calls to kfree()
Date 2016-01-15 18:50 +0100
Message-ID <qRgFC-W7-49@gated-at.bofh.it> (permalink)
References <qRgFz-W7-11@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Peter Senna Tschudin <peter.senna@gmail.com>

This patch removes null test before calls to kfree() as kfree() can
handle null pointers safely.

Signed-off-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
No changes from V1.

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 40f360a..bea6d88 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

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH V2 0/7] usb-misc: sisusbvga: cleanup and bug fix Peter Senna Tschudin <peter.senna@collabora.com> - 2016-01-15 18:50 +0100
  [PATCH V2 5/7] usb-misc: sisusbvga: Remove null test before calls to kfree() Peter Senna Tschudin <peter.senna@collabora.com> - 2016-01-15 18:50 +0100
  Re: [PATCH V2 0/7] usb-misc: sisusbvga: cleanup and bug fix Joe Perches <joe@perches.com> - 2016-01-15 19:00 +0100
    Re: [PATCH V2 0/7] usb-misc: sisusbvga: cleanup and bug fix Jason Cooper <jason@lakedaemon.net> - 2016-01-15 19:10 +0100
  Re: [PATCH V2 1/7] usb-misc: sisusbvga: Fix coding style:  horizontal whitespace changes Joe Perches <joe@perches.com> - 2016-01-15 19:00 +0100
    Re: [PATCH V2 1/7] usb-misc: sisusbvga: Fix coding style: horizontal whitespace changes "Peter Senna" <peter.senna@collabora.co.uk> - 2016-01-15 19:10 +0100
      Re: Re: [PATCH V2 1/7] usb-misc: sisusbvga: Fix coding style: horizontal whitespace changes Alan Stern <stern@rowland.harvard.edu> - 2016-01-15 19:30 +0100

csiph-web