V4L/DVB: cx18: address possible passing of NULL to snd_card_free

Eliminate the possibility of passing NULL to snd_card_free().

Thanks to Takashi Iwai for reviewing and pointing this out.

This work was sponsored by ONELAN Limited.

Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx18/cx18-alsa-main.c b/drivers/media/video/cx18/cx18-alsa-main.c
index 2b72f42e8461277dc9256d2525b0cb4a8341cf72..9efabf5e260ff840939acf89962d894794855291 100644 (file)
--- a/drivers/media/video/cx18/cx18-alsa-main.c
+++ b/drivers/media/video/cx18/cx18-alsa-main.c
@@ -134,7 +134,7 @@ static int __init snd_cx18_card_set_names(struct snd_cx18_card *cxsc)
 static int __init snd_cx18_init(struct v4l2_device *v4l2_dev)
 {
        struct cx18 *cx = to_cx18(v4l2_dev);
-       struct snd_card *sc;
+       struct snd_card *sc = NULL;
        struct snd_cx18_card *cxsc;
        int ret;
 
@@ -189,7 +189,8 @@ static int __init snd_cx18_init(struct v4l2_device *v4l2_dev)
        return 0;
 
 err_exit_free:
-       snd_card_free(sc);
+       if (sc != NULL)
+               snd_card_free(sc);
 err_exit:
        return ret;
 }