From bde87475ff7d229619eb090af58c7e496bd3fa60 Mon Sep 17 00:00:00 2001 From: Mark Farrugia Date: Fri, 31 Aug 2018 17:40:44 +1000 Subject: Add additional NULL checks Check for NULL pointers before free'ing memory on cleanup of AVIRT Signed-off-by: Mark Farrugia --- alsa.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'alsa.c') diff --git a/alsa.c b/alsa.c index 44e0b15..738048f 100755 --- a/alsa.c +++ b/alsa.c @@ -203,17 +203,17 @@ int avirt_alsa_register(struct platform_device *devptr) */ int avirt_alsa_deregister(void) { + CHK_NULL(_driver->card); snd_card_free(_driver->card); - - if (_driver->playback.config) - kfree(_driver->playback.config); - if (_driver->playback.streams) - kfree(_driver->playback.streams); - if (_driver->capture.config) - kfree(_driver->capture.config); - if (_driver->capture.streams) - kfree(_driver->capture.streams); - + CHK_NULL(_driver->playback.config); + kfree(_driver->playback.config); + CHK_NULL(_driver->playback.streams); + kfree(_driver->playback.streams); + CHK_NULL(_driver->capture.config); + kfree(_driver->capture.config); + CHK_NULL(_driver->capture.streams); + kfree(_driver->capture.streams); + CHK_NULL(_driver); kfree(_driver); return 0; -- cgit 1.2.3-korg