diff options
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index 5956c35d3..4bb779aef 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c @@ -1745,9 +1745,7 @@ void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca) for (i = 0; i < ca->slot_count; i++) { dvb_ca_en50221_slot_shutdown(ca, i); - if (ca->slot_info[i].rx_buffer.data != NULL) { - vfree(ca->slot_info[i].rx_buffer.data); - } + vfree(ca->slot_info[i].rx_buffer.data); } kfree(ca->slot_info); dvb_unregister_device(ca->dvbdev); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 406a3e129..3f98fbe3e 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-12-01 06:05 mkrufky + + * ../linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c: + (dvb_ca_en50221_release): + - vfree(NULL) is legal. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-11-30 16:18 mchehab * ../linux/drivers/media/video/tuner-simple.c: |