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

[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
...@@ -2960,6 +2960,10 @@ static void init_easycap(struct easycap *peasycap, ...@@ -2960,6 +2960,10 @@ static void init_easycap(struct easycap *peasycap,
peasycap->audio_isoc_buffer_size = -1; peasycap->audio_isoc_buffer_size = -1;
peasycap->frame_buffer_many = FRAME_BUFFER_MANY; 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) static int populate_inputset(struct easycap *peasycap)
...@@ -2972,7 +2976,6 @@ static int populate_inputset(struct easycap *peasycap) ...@@ -2972,7 +2976,6 @@ static int populate_inputset(struct easycap *peasycap)
inputset = peasycap->inputset; inputset = peasycap->inputset;
/* FIXME: peasycap->ntsc is not yet initialized */
fmtidx = peasycap->ntsc ? NTSC_M : PAL_BGHIN; fmtidx = peasycap->ntsc ? NTSC_M : PAL_BGHIN;
m = 0; m = 0;
...@@ -3650,9 +3653,6 @@ static int easycap_usb_probe(struct usb_interface *intf, ...@@ -3650,9 +3653,6 @@ static int easycap_usb_probe(struct usb_interface *intf,
* because some udev rules triggers easycap_open() * because some udev rules triggers easycap_open()
* immediately after registration, causing a clash. * immediately after registration, causing a clash.
*/ */
peasycap->ntsc = easycap_ntsc;
JOM(8, "defaulting initially to %s\n",
easycap_ntsc ? "NTSC" : "PAL");
rc = reset(peasycap); rc = reset(peasycap);
if (rc) { if (rc) {
SAM("ERROR: reset() rc = %i\n", rc); SAM("ERROR: reset() rc = %i\n", rc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment