Skip to content

Commit

Permalink
[media] saa7134: add test after for loop
Browse files Browse the repository at this point in the history
Add a check after the for loops to see if we found what we were looking
for or if we reached the end of the list.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Dan Carpenter authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent 8a197fc commit 06e6588
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/media/video/saa7134/saa7134-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1871,9 +1871,12 @@ int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_
else
fixup = V4L2_STD_SECAM;
}
for (i = 0; i < TVNORMS; i++)
for (i = 0; i < TVNORMS; i++) {
if (fixup == tvnorms[i].id)
break;
}
if (i == TVNORMS)
return -EINVAL;
}

*id = tvnorms[i].id;
Expand Down Expand Up @@ -1997,9 +2000,12 @@ static int saa7134_g_tuner(struct file *file, void *priv,
if (0 != t->index)
return -EINVAL;
memset(t, 0, sizeof(*t));
for (n = 0; n < SAA7134_INPUT_MAX; n++)
for (n = 0; n < SAA7134_INPUT_MAX; n++) {
if (card_in(dev, n).tv)
break;
}
if (n == SAA7134_INPUT_MAX)
return -EINVAL;
if (NULL != card_in(dev, n).name) {
strcpy(t->name, "Television");
t->type = V4L2_TUNER_ANALOG_TV;
Expand Down

0 comments on commit 06e6588

Please sign in to comment.