dmxdev.c vfree() checking cleanups. Signed-off by: James Lamanna Signed-off-by: Domen Puncer --- kj-domen/drivers/media/dvb/dvb-core/dmxdev.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff -puN drivers/media/dvb/dvb-core/dmxdev.c~vfree-drivers_media_dvb_dvb-core_dmxdev drivers/media/dvb/dvb-core/dmxdev.c --- kj/drivers/media/dvb/dvb-core/dmxdev.c~vfree-drivers_media_dvb_dvb-core_dmxdev 2005-01-23 00:24:00.000000000 +0100 +++ kj-domen/drivers/media/dvb/dvb-core/dmxdev.c 2005-01-23 00:24:00.000000000 +0100 @@ -304,8 +304,7 @@ static int dvb_dmxdev_set_buffer_size(st 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_dmxdev_release(struct dmxdev *dmxdev { 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); _