V4L/DVB (5304): Improve chip matching in v4l2_register

The chip matching in struct v4l2_register for VIDIOC_DBG_G/S_REGISTER 
was rather primitive. It could not be extended to other busses besides 
i2c and it lacked a way to.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index a97be1bdc31d..bdfe2af70124 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1389,7 +1389,7 @@ static int vidioc_g_register (struct file *file, void *fh,
 {
         struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core;
 
-        if (reg->i2c_id != 0)
+        if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
                 return -EINVAL;
         /* cx2388x has a 24-bit register space */
         reg->val = cx_read(reg->reg&0xffffff);
@@ -1401,7 +1401,7 @@ static int vidioc_s_register (struct file *file, void *fh,
 {
         struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core;
 
-        if (reg->i2c_id != 0)
+        if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
                 return -EINVAL;
         cx_write(reg->reg&0xffffff, reg->val);
         return 0;