From d61d1d54bf300e40794c8a2c1f5c82d44442d79e Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 25 Feb 2010 17:34:09 -0300 Subject: [PATCH] --- yaml --- r: 181698 b: refs/heads/master c: dfbd5d4d324e630aedc40b7519351a9c0fe94dc9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tvp7002.c | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 2fe0a0ef912d..5a04942edc01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b67553657330b5ad5c78a974ce84273a515fe4e +refs/heads/master: dfbd5d4d324e630aedc40b7519351a9c0fe94dc9 diff --git a/trunk/drivers/media/video/tvp7002.c b/trunk/drivers/media/video/tvp7002.c index 0f0270b1ad7a..5a878bca02d4 100644 --- a/trunk/drivers/media/video/tvp7002.c +++ b/trunk/drivers/media/video/tvp7002.c @@ -859,13 +859,17 @@ static int tvp7002_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) { struct i2c_client *client = v4l2_get_subdevdata(sd); + u8 val; + int ret; if (!v4l2_chip_match_i2c_client(client, ®->match)) return -EINVAL; if (!capable(CAP_SYS_ADMIN)) return -EPERM; - return reg->val < 0 ? -EINVAL : 0; + ret = tvp7002_read(sd, reg->reg & 0xff, &val); + reg->val = val; + return ret; } /* @@ -881,21 +885,13 @@ static int tvp7002_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) { struct i2c_client *client = v4l2_get_subdevdata(sd); - struct tvp7002 *device = to_tvp7002(sd); - int wres; if (!v4l2_chip_match_i2c_client(client, ®->match)) return -EINVAL; if (!capable(CAP_SYS_ADMIN)) return -EPERM; - wres = tvp7002_write(sd, reg->reg & 0xff, reg->val & 0xff); - - /* Update the register value in device's table */ - if (!wres) - device->registers[reg->reg].value = reg->val; - - return wres < 0 ? -EINVAL : 0; + return tvp7002_write(sd, reg->reg & 0xff, reg->val & 0xff); } #endif