---

yaml --- r: 181569 b: refs/heads/master c: c71fd16 h: refs/heads/master i: 181567: 989827e v: v3
git-mirror · Feb 26, 2010 · 18a7981 · 18a7981
1 parent e48ab05
commit 18a7981
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 }