[media] cx25840: initialize the standard to NTSC_M

This is necessary since the *_std_setup functions rely on a valid state->std
field.

Also fix the cx23888_std_setup() to test for 60Hz instead of NTSC, just like
cx25840_std_setup() does.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index a8b1a03d3158..f2e2c34ddbbd 100644
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -4977,7 +4977,7 @@ static void cx23888_std_setup(struct i2c_client *client)
         cx25840_write4(client, 0x4b4, 0x20524030);
         cx25840_write4(client, 0x47c, 0x010a8263);
 
-        if (std & V4L2_STD_NTSC) {
+        if (std & V4L2_STD_525_60) {
                 v4l_dbg(1, cx25840_debug, client, "%s() Selecting NTSC",
                         __func__);
 
@@ -5268,6 +5268,7 @@ static int cx25840_probe(struct i2c_client *client,
         state->id = id;
         state->rev = device_id;
         state->vbi_regs_offset = id == CX23888_AV ? 0x500 - 0x424 : 0;
+        state->std = V4L2_STD_NTSC_M;
         v4l2_ctrl_handler_init(&state->hdl, 9);
         v4l2_ctrl_new_std(&state->hdl, &cx25840_ctrl_ops,
                         V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);