From 04881b5ca576bb71a89057447039248e5db8b36b Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 23 May 2012 06:32:52 -0300 Subject: [PATCH] --- yaml --- r: 311279 b: refs/heads/master c: f9ac50c244f9030b300d6f390e838239612d7efa h: refs/heads/master i: 311277: d5311a5e37ee548c2252029a74336fb88b738d8b 311275: 01aa7619caf5a5a39e95ed8cb75e40cbd7600819 311271: 5269dc12c4082a945b40eae5ef4672f692e9534f 311263: dd8221b1eecd13182454e194342a65e9e1598022 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vino.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c3ea286b42e6..08169f359796 100644 --- 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 index 4d7391ec8001..aae1720b2f2d 100644 --- 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,