V4L/DVB: tvp7002: fix compilation breakage when advanced debug is enabled

> On Mon, 22 Feb 2010 08:21:44 -0800 Randy Dunlap wrote:
> drivers/media/video/tvp7002.c:896: error: 'struct tvp7002' has no member named 'registers'
>
> so where are these registers??

Hmm, that code is a remnant from older revisions of this driver. Unfortunately,
when I compiled this driver before creating my pull request I forgot to turn on
the CONFIG_VIDEO_ADV_DEBUG option and so I never saw it.

Also fixed the g_register function: it never returned a register
value in the original code.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/media/video/tvp7002.c b/drivers/media/video/tvp7002.c
index 0f0270b1ad7a..5a878bca02d4 100644
--- a/drivers/media/video/tvp7002.c
+++ b/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, &reg->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, &reg->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