aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/cx18
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2010-01-07 00:52:39 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 15:10:44 -0300
commitc71fd169a13d34f26997b27183b510e0b7fc2623 (patch)
treeea54d454a3dde270a11fbdd6bf0edfa87ac2fad9 /drivers/media/video/cx18
parent60433e2ab8391d1884ddef2269bd19ecdaaa2d72 (diff)
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>
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r--drivers/media/video/cx18/cx18-alsa-main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-alsa-main.c b/drivers/media/video/cx18/cx18-alsa-main.c
index 2b72f42e846..9efabf5e260 100644
--- 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;
}