[media] staging: easycap: Initialize 'ntsc' parameter before usage
authorEzequiel García <elezegarcia@gmail.com>
Fri, 24 Feb 2012 14:24:17 +0000 (11:24 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 15 May 2012 11:56:36 +0000 (08:56 -0300)
This parameter is now initialized at init_easycap(),
this way we assure it won't be used uninitialized.

Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/media/easycap/easycap_main.c

index 9d6dc09656be233b15c05f28942023810e81ccf9..480164d8698cf2dfb31ff35d9f2bf8a814d44388 100644 (file)
@@ -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);