Commit 274cb009 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

media: cx18: fix incorrect input counting

Counting the number of video and audio inputs was wrong if the
number of inputs equalled CX18_CARD_MAX_VIDEO_INPUTS or
CX18_CARD_MAX_AUDIO_INPUTS. This was a copy-and-paste from the
ivtv driver. That driver has been fixed quite a long time ago,
but we missed that this driver had the same bug.
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 643e8350
...@@ -771,11 +771,11 @@ static void cx18_init_struct2(struct cx18 *cx) ...@@ -771,11 +771,11 @@ static void cx18_init_struct2(struct cx18 *cx)
{ {
int i; int i;
for (i = 0; i < CX18_CARD_MAX_VIDEO_INPUTS - 1; i++) for (i = 0; i < CX18_CARD_MAX_VIDEO_INPUTS; i++)
if (cx->card->video_inputs[i].video_type == 0) if (cx->card->video_inputs[i].video_type == 0)
break; break;
cx->nof_inputs = i; cx->nof_inputs = i;
for (i = 0; i < CX18_CARD_MAX_AUDIO_INPUTS - 1; i++) for (i = 0; i < CX18_CARD_MAX_AUDIO_INPUTS; i++)
if (cx->card->audio_inputs[i].audio_type == 0) if (cx->card->audio_inputs[i].audio_type == 0)
break; break;
cx->nof_audio_inputs = i; cx->nof_audio_inputs = i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment