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

Commit 751869e6 authored by Ezequiel García's avatar Ezequiel García Committed by Mauro Carvalho Chehab
Browse files

[media] staging: easycap: Initialize 'ntsc' parameter before usage 



This parameter is now initialized at init_easycap(),
this way we assure it won't be used uninitialized.

Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f9482d01

drivers/staging/media/easycap/easycap_main.c

+4 −4
Original line number Diff line number Diff line
@@ -2960,6 +2960,10 @@ static void init_easycap(struct easycap *peasycap, 
	peasycap->audio_isoc_buffer_size = -1;



	peasycap->frame_buffer_many = FRAME_BUFFER_MANY;



	peasycap->ntsc = easycap_ntsc;

	JOM(8, "defaulting initially to %s\n",

		easycap_ntsc ? "NTSC" : "PAL");

}



static int populate_inputset(struct easycap *peasycap)
@@ -2972,7 +2976,6 @@ static int populate_inputset(struct easycap *peasycap) 


	inputset = peasycap->inputset;



	/* FIXME: peasycap->ntsc is not yet initialized */

	fmtidx = peasycap->ntsc ? NTSC_M : PAL_BGHIN;



	m = 0;
@@ -3650,9 +3653,6 @@ static int easycap_usb_probe(struct usb_interface *intf, 
		 * because some udev rules triggers easycap_open()

		 * immediately after registration, causing a clash.

		 */

		peasycap->ntsc = easycap_ntsc;

		JOM(8, "defaulting initially to %s\n",

			easycap_ntsc ? "NTSC" : "PAL");

		rc = reset(peasycap);

		if (rc) {

			SAM("ERROR: reset() rc = %i\n", rc);