diff options
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-video.c')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index 7c61c6d5cede..2be5e47ed081 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -477,12 +477,12 @@ static int usbvision_v4l2_close(struct file *file) | |||
477 | */ | 477 | */ |
478 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 478 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
479 | static int vidioc_g_register (struct file *file, void *priv, | 479 | static int vidioc_g_register (struct file *file, void *priv, |
480 | struct v4l2_register *reg) | 480 | struct v4l2_dbg_register *reg) |
481 | { | 481 | { |
482 | struct usb_usbvision *usbvision = video_drvdata(file); | 482 | struct usb_usbvision *usbvision = video_drvdata(file); |
483 | int errCode; | 483 | int errCode; |
484 | 484 | ||
485 | if (!v4l2_chip_match_host(reg->match_type, reg->match_chip)) | 485 | if (!v4l2_chip_match_host(®->match)) |
486 | return -EINVAL; | 486 | return -EINVAL; |
487 | /* NT100x has a 8-bit register space */ | 487 | /* NT100x has a 8-bit register space */ |
488 | errCode = usbvision_read_reg(usbvision, reg->reg&0xff); | 488 | errCode = usbvision_read_reg(usbvision, reg->reg&0xff); |
@@ -492,16 +492,17 @@ static int vidioc_g_register (struct file *file, void *priv, | |||
492 | return errCode; | 492 | return errCode; |
493 | } | 493 | } |
494 | reg->val = errCode; | 494 | reg->val = errCode; |
495 | reg->size = 1; | ||
495 | return 0; | 496 | return 0; |
496 | } | 497 | } |
497 | 498 | ||
498 | static int vidioc_s_register (struct file *file, void *priv, | 499 | static int vidioc_s_register (struct file *file, void *priv, |
499 | struct v4l2_register *reg) | 500 | struct v4l2_dbg_register *reg) |
500 | { | 501 | { |
501 | struct usb_usbvision *usbvision = video_drvdata(file); | 502 | struct usb_usbvision *usbvision = video_drvdata(file); |
502 | int errCode; | 503 | int errCode; |
503 | 504 | ||
504 | if (!v4l2_chip_match_host(reg->match_type, reg->match_chip)) | 505 | if (!v4l2_chip_match_host(®->match)) |
505 | return -EINVAL; | 506 | return -EINVAL; |
506 | /* NT100x has a 8-bit register space */ | 507 | /* NT100x has a 8-bit register space */ |
507 | errCode = usbvision_write_reg(usbvision, reg->reg&0xff, reg->val); | 508 | errCode = usbvision_write_reg(usbvision, reg->reg&0xff, reg->val); |