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

Commit dfcf36d9 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] Revert "[media] ivtv: avoid going past input/audio array" 

This patch broke ivtv logic, as reported at
 https://bugzilla.redhat.com/show_bug.cgi?id=1278942



This reverts commit 09290cc8.

Cc: stable@vger.kernel.org # for v4.1 and upper
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 8005c49d

drivers/media/pci/ivtv/ivtv-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -805,11 +805,11 @@ static void ivtv_init_struct2(struct ivtv *itv) 
{

	int i;



	for (i = 0; i < IVTV_CARD_MAX_VIDEO_INPUTS - 1; i++)

	for (i = 0; i < IVTV_CARD_MAX_VIDEO_INPUTS; i++)

		if (itv->card->video_inputs[i].video_type == 0)

			break;

	itv->nof_inputs = i;

	for (i = 0; i < IVTV_CARD_MAX_AUDIO_INPUTS - 1; i++)

	for (i = 0; i < IVTV_CARD_MAX_AUDIO_INPUTS; i++)

		if (itv->card->audio_inputs[i].audio_type == 0)

			break;

	itv->nof_audio_inputs = i;