diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-10 10:54:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-10 10:54:45 -0300 |
| commit | 18af961f48808a7aaad697abc64a3c6ee405aef1 (patch) | |
| tree | b99a667eb2f101bdb94e7ea91517cb0575019550 /linux/drivers/media/video/cx25840/cx25840-vbi.c | |
| parent | a995217ac193b3af9f75eaaece38717034e42583 (diff) | |
| parent | 8a9152967f3467949c4a6ec02ef9623be9f396fb (diff) | |
| download | mediapointer-dvb-s2-18af961f48808a7aaad697abc64a3c6ee405aef1.tar.gz mediapointer-dvb-s2-18af961f48808a7aaad697abc64a3c6ee405aef1.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-vbi.c')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-vbi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-vbi.c b/linux/drivers/media/video/cx25840/cx25840-vbi.c index f8fe2c6ef..2d8364e65 100644 --- a/linux/drivers/media/video/cx25840/cx25840-vbi.c +++ b/linux/drivers/media/video/cx25840/cx25840-vbi.c @@ -86,7 +86,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; @@ -243,7 +243,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; @@ -280,7 +280,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]; |