diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-video.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index b93b7ab99d8c..791e69d804f9 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1447,25 +1447,26 @@ static int vidioc_s_frequency (struct file *file, void *priv, | |||
1447 | 1447 | ||
1448 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 1448 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
1449 | static int vidioc_g_register (struct file *file, void *fh, | 1449 | static int vidioc_g_register (struct file *file, void *fh, |
1450 | struct v4l2_register *reg) | 1450 | struct v4l2_dbg_register *reg) |
1451 | { | 1451 | { |
1452 | struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core; | 1452 | struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core; |
1453 | 1453 | ||
1454 | if (!v4l2_chip_match_host(reg->match_type, reg->match_chip)) | 1454 | if (!v4l2_chip_match_host(®->match)) |
1455 | return -EINVAL; | 1455 | return -EINVAL; |
1456 | /* cx2388x has a 24-bit register space */ | 1456 | /* cx2388x has a 24-bit register space */ |
1457 | reg->val = cx_read(reg->reg&0xffffff); | 1457 | reg->val = cx_read(reg->reg & 0xffffff); |
1458 | reg->size = 4; | ||
1458 | return 0; | 1459 | return 0; |
1459 | } | 1460 | } |
1460 | 1461 | ||
1461 | static int vidioc_s_register (struct file *file, void *fh, | 1462 | static int vidioc_s_register (struct file *file, void *fh, |
1462 | struct v4l2_register *reg) | 1463 | struct v4l2_dbg_register *reg) |
1463 | { | 1464 | { |
1464 | struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core; | 1465 | struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core; |
1465 | 1466 | ||
1466 | if (!v4l2_chip_match_host(reg->match_type, reg->match_chip)) | 1467 | if (!v4l2_chip_match_host(®->match)) |
1467 | return -EINVAL; | 1468 | return -EINVAL; |
1468 | cx_write(reg->reg&0xffffff, reg->val); | 1469 | cx_write(reg->reg & 0xffffff, reg->val); |
1469 | return 0; | 1470 | return 0; |
1470 | } | 1471 | } |
1471 | #endif | 1472 | #endif |