From 18a7981b25aa5668e9ada093dd3a8de8aceddc8e Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Thu, 7 Jan 2010 00:52:39 -0300 Subject: [PATCH] --- yaml --- r: 181569 b: refs/heads/master c: c71fd169a13d34f26997b27183b510e0b7fc2623 h: refs/heads/master i: 181567: 989827e2b107b593489734fd1e8cdbcb12490a80 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx18/cx18-alsa-main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 377d5e487812..5ae82f35cc1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60433e2ab8391d1884ddef2269bd19ecdaaa2d72 +refs/heads/master: c71fd169a13d34f26997b27183b510e0b7fc2623 diff --git a/trunk/drivers/media/video/cx18/cx18-alsa-main.c b/trunk/drivers/media/video/cx18/cx18-alsa-main.c index 2b72f42e8461..9efabf5e260f 100644 --- a/trunk/drivers/media/video/cx18/cx18-alsa-main.c +++ b/trunk/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; }