---

yaml --- r: 311279 b: refs/heads/master c: f9ac50c h: refs/heads/master i: 311277: d5311a5 311275: 01aa761 311271: 5269dc1 311263: dd8221b v: v3
git-mirror · Jun 11, 2012 · 04881b5 · 04881b5
1 parent 85ef4e9
commit 04881b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91e0cd499fe8482d5104c1f8f49b478f76617b40
+refs/heads/master: f9ac50c244f9030b300d6f390e838239612d7efa
diff --git a/trunk/drivers/media/video/vino.c b/trunk/drivers/media/video/vino.c
@@ -2561,7 +2561,7 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
 	} else if (vino_drvdata->decoder
 		   && (vino_drvdata->decoder_owner == VINO_NO_CHANNEL)) {
 		int input;
-		int data_norm;
+		int data_norm = 0;
 		v4l2_std_id norm;
 
 		input = VINO_INPUT_COMPOSITE;
@@ -2651,7 +2651,7 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
 		}
 
 		if (vino_drvdata->decoder_owner == vcs->channel) {
-			int data_norm;
+			int data_norm = 0;
 			v4l2_std_id norm;
 
 			ret = decoder_call(video, s_routing,