Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06e6588e authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

[media] saa7134: add test after for loop 



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: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8a197fcc

drivers/media/video/saa7134/saa7134-video.c

+8 −2
Original line number Diff line number Diff line
@@ -1871,10 +1871,13 @@ 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;
@@ -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;