[KJ] [PATCH] [12/29] dmxdev.c - vfree() checking cleanups

[KJ] [PATCH] [12/29] dmxdev.c - vfree() checking cleanups

[jlamanna]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

dmxdev.c vfree() checking cleanups.

Signed-off by: James Lamanna <jlamanna@gmail.com>

 dmxdev.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)


--- linux-2.6.10-vanilla/drivers/media/dvb/dvb-core/dmxdev.c	2004-12-24 13:35:23.000000000 -0800
+++ linux-2.6.10/drivers/media/dvb/dvb-core/dmxdev.c	2005-01-04 11:36:27.000000000 -0800
@@ -304,8 +304,7 @@
 	buf->size 	buf->pwrite�->pread 	spin_unlock_irq(&dmxdevfilter->dev->lock);
-	if (mem) 
-		vfree(mem);
+	vfree(mem);
 		
 	if (buf->size) {
 		mem@@ -1123,14 +1122,10 @@
 {
 	dvb_unregister_device(dmxdev->dvbdev);
 	dvb_unregister_device(dmxdev->dvr_dvbdev);
-	if (dmxdev->filter) {
-		vfree(dmxdev->filter);
-		dmxdev->filter-	}
-	if (dmxdev->dvr) {
-		vfree(dmxdev->dvr);
-		dmxdev->dvr-	}
+	vfree(dmxdev->filter);
+	dmxdev->filter+	vfree(dmxdev->dvr);
+	dmxdev->dvr 	dmxdev->demux->close(dmxdev->demux);
 }
 EXPORT_SYMBOL(dvb_dmxdev_release);



[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors