Skip to contentSkip to conversation

dmxdev.c - vfree() checking cleanups

PATCH RESEND Applied [email protected] 1 participant 1 message Jan 4, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 12/29 dmxdev.c - vfree() checking cleanups

dmxdev.c vfree() checking cleanups.

Signed-off by: James Lamanna <[email protected]>

 dmxdev.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
drivers/media/dvb/dvb-core/dmxdev.c +5 -10
@@ -304,8 +304,7 @@
 	buf->size=size;
 	buf->pwrite=buf->pread=0;    
 	spin_unlock_irq(&dmxdevfilter->dev->lock);
-	if (mem) 
-		vfree(mem);
+	vfree(mem);
 		
 	if (buf->size) {
 		mem=vmalloc(dmxdevfilter->buffer.size);
@@ -1123,14 +1122,10 @@
 {
 	dvb_unregister_device(dmxdev->dvbdev);
 	dvb_unregister_device(dmxdev->dvr_dvbdev);
-	if (dmxdev->filter) {
-		vfree(dmxdev->filter);
-		dmxdev->filter=NULL;
-	}
-	if (dmxdev->dvr) {
-		vfree(dmxdev->dvr);
-		dmxdev->dvr=NULL;
-	}
+	vfree(dmxdev->filter);
+	dmxdev->filter=NULL;
+	vfree(dmxdev->dvr);
+	dmxdev->dvr=NULL;
 	dmxdev->demux->close(dmxdev->demux);
 }
 EXPORT_SYMBOL(dvb_dmxdev_release);

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors