dvb_demux.c vfree() checking cleanups. Signed-off by: James Lamanna Signed-off-by: Domen Puncer --- kj-domen/drivers/media/dvb/dvb-core/dvb_demux.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff -puN drivers/media/dvb/dvb-core/dvb_demux.c~vfree-drivers_media_dvb_dvb-core_dvb_demux drivers/media/dvb/dvb-core/dvb_demux.c --- kj/drivers/media/dvb/dvb-core/dvb_demux.c~vfree-drivers_media_dvb_dvb-core_dvb_demux 2005-01-23 00:24:01.000000000 +0100 +++ kj-domen/drivers/media/dvb/dvb-core/dvb_demux.c 2005-01-23 00:24:01.000000000 +0100 @@ -784,10 +784,8 @@ static int dvbdmx_release_ts_feed(struct } #ifndef NOBUFS - if (feed->buffer) { - vfree(feed->buffer); - feed->buffer=0; - } + vfree(feed->buffer); + feed->buffer=0; #endif feed->state = DMX_STATE_FREE; @@ -1055,10 +1053,8 @@ static int dvbdmx_release_section_feed(s return -EINVAL; } #ifndef NOBUFS - if (dvbdmxfeed->buffer) { - vfree(dvbdmxfeed->buffer); - dvbdmxfeed->buffer=0; - } + vfree(dvbdmxfeed->buffer); + dvbdmxfeed->buffer=0; #endif dvbdmxfeed->state=DMX_STATE_FREE; @@ -1269,10 +1265,8 @@ int dvb_dmx_release(struct dvb_demux *dv struct dmx_demux *dmx = &dvbdemux->dmx; dmx_unregister_demux(dmx); - if (dvbdemux->filter) - vfree(dvbdemux->filter); - if (dvbdemux->feed) - vfree(dvbdemux->feed); + vfree(dvbdemux->filter); + vfree(dvbdemux->feed); return 0; } EXPORT_SYMBOL(dvb_dmx_release); _