diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 10:17:59 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 10:17:59 -0200 |
| commit | 3f85abb813f1ad7454fb7a2f8e2998373571fe39 (patch) | |
| tree | cf89a87206ea42719ee69f209d43a704034b2c22 /linux/drivers/media/video/tvp5150.c | |
| parent | b0ab681e920adac28d099cb1ec192d2ada2c160f (diff) | |
| parent | b50e38700408ec0bb073fc56ade123a1305842b6 (diff) | |
| download | mediapointer-dvb-s2-3f85abb813f1ad7454fb7a2f8e2998373571fe39.tar.gz mediapointer-dvb-s2-3f85abb813f1ad7454fb7a2f8e2998373571fe39.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/tvp5150.c')
| -rw-r--r-- | linux/drivers/media/video/tvp5150.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c index 404df4aa2..f968e8941 100644 --- a/linux/drivers/media/video/tvp5150.c +++ b/linux/drivers/media/video/tvp5150.c @@ -1030,7 +1030,7 @@ static int tvp5150_decode_vbi_line(struct v4l2_subdev *sd, #endif static int tvp5150_g_chip_ident(struct v4l2_subdev *sd, - struct v4l2_chip_ident *chip) + struct v4l2_dbg_chip_ident *chip) { int rev; struct i2c_client *client = v4l2_get_subdevdata(sd); @@ -1044,25 +1044,24 @@ static int tvp5150_g_chip_ident(struct v4l2_subdev *sd, #ifdef CONFIG_VIDEO_ADV_DEBUG -static int tvp5150_g_register(struct v4l2_subdev *sd, struct v4l2_register *reg) +static int tvp5150_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) { struct i2c_client *client = v4l2_get_subdevdata(sd); - if (!v4l2_chip_match_i2c_client(client, - reg->match_type, reg->match_chip)) + if (!v4l2_chip_match_i2c_client(client, ®->match)) return -EINVAL; if (!capable(CAP_SYS_ADMIN)) return -EPERM; reg->val = tvp5150_read(sd, reg->reg & 0xff); + reg->size = 1; return 0; } -static int tvp5150_s_register(struct v4l2_subdev *sd, struct v4l2_register *reg) +static int tvp5150_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) { struct i2c_client *client = v4l2_get_subdevdata(sd); - if (!v4l2_chip_match_i2c_client(client, - reg->match_type, reg->match_chip)) + if (!v4l2_chip_match_i2c_client(client, ®->match)) return -EINVAL; if (!capable(CAP_SYS_ADMIN)) return -EPERM; |