diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-11 10:31:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-11 10:31:07 +0100 |
| commit | 9e9fd65d1fa51d919d54d731be0e66492b5b6c5a (patch) | |
| tree | a1c7bd35ccff62ff2e678514d3599110f18f113a /drivers/media/video/vino.c | |
| parent | 05644147064acabb8587c4cbd690047494f7b3a1 (diff) | |
| parent | 5b063b87deba33ed1676db9d16c52ede662132d8 (diff) | |
Merge branch 'pl022' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into spi-next
Diffstat (limited to 'drivers/media/video/vino.c')
| -rw-r--r-- | drivers/media/video/vino.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 4d7391ec800..aae1720b2f2 100644 --- a/drivers/media/video/vino.c +++ b/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, |