V4L/DVB (7344): cx25840: better PAL-M and NTSC-KR handling

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/cx25840/cx25840-vbi.c b/drivers/media/video/cx25840/cx25840-vbi.c
index 6828f59b9d83..c754b9d13369 100644
--- a/drivers/media/video/cx25840/cx25840-vbi.c
+++ b/drivers/media/video/cx25840/cx25840-vbi.c
@@ -85,7 +85,7 @@ static int decode_vps(u8 * dst, u8 * p)
 void cx25840_vbi_setup(struct i2c_client *client)
 {
         struct cx25840_state *state = i2c_get_clientdata(client);
-        v4l2_std_id std = cx25840_get_v4lstd(client);
+        v4l2_std_id std = state->std;
         int hblank,hactive,burst,vblank,vactive,sc,vblank656,src_decimation;
         int luma_lpf,uv_lpf, comb;
         u32 pll_int,pll_frac,pll_post;
@@ -242,7 +242,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
                         0, 0, V4L2_SLICED_VPS, 0, 0,    /* 9 */
                         0, 0, 0, 0
                 };
-                int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60);
+                int is_pal = !(state->std & V4L2_STD_525_60);
                 int i;
 
                 fmt = arg;
@@ -279,7 +279,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
 
         case VIDIOC_S_FMT:
         {
-                int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60);
+                int is_pal = !(state->std & V4L2_STD_525_60);
                 int vbi_offset = is_pal ? 1 : 0;
                 int i, x;
                 u8 lcr[24];