diff options
Diffstat (limited to 'drivers/media/video/saa7127.c')
-rw-r--r-- | drivers/media/video/saa7127.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c index bfc85654795e..d6848f7a503b 100644 --- a/drivers/media/video/saa7127.c +++ b/drivers/media/video/saa7127.c | |||
@@ -623,25 +623,24 @@ static int saa7127_s_vbi_data(struct v4l2_subdev *sd, const struct v4l2_sliced_v | |||
623 | } | 623 | } |
624 | 624 | ||
625 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 625 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
626 | static int saa7127_g_register(struct v4l2_subdev *sd, struct v4l2_register *reg) | 626 | static int saa7127_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) |
627 | { | 627 | { |
628 | struct i2c_client *client = v4l2_get_subdevdata(sd); | 628 | struct i2c_client *client = v4l2_get_subdevdata(sd); |
629 | 629 | ||
630 | if (!v4l2_chip_match_i2c_client(client, | 630 | if (!v4l2_chip_match_i2c_client(client, ®->match)) |
631 | reg->match_type, reg->match_chip)) | ||
632 | return -EINVAL; | 631 | return -EINVAL; |
633 | if (!capable(CAP_SYS_ADMIN)) | 632 | if (!capable(CAP_SYS_ADMIN)) |
634 | return -EPERM; | 633 | return -EPERM; |
635 | reg->val = saa7127_read(sd, reg->reg & 0xff); | 634 | reg->val = saa7127_read(sd, reg->reg & 0xff); |
635 | reg->size = 1; | ||
636 | return 0; | 636 | return 0; |
637 | } | 637 | } |
638 | 638 | ||
639 | static int saa7127_s_register(struct v4l2_subdev *sd, struct v4l2_register *reg) | 639 | static int saa7127_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) |
640 | { | 640 | { |
641 | struct i2c_client *client = v4l2_get_subdevdata(sd); | 641 | struct i2c_client *client = v4l2_get_subdevdata(sd); |
642 | 642 | ||
643 | if (!v4l2_chip_match_i2c_client(client, | 643 | if (!v4l2_chip_match_i2c_client(client, ®->match)) |
644 | reg->match_type, reg->match_chip)) | ||
645 | return -EINVAL; | 644 | return -EINVAL; |
646 | if (!capable(CAP_SYS_ADMIN)) | 645 | if (!capable(CAP_SYS_ADMIN)) |
647 | return -EPERM; | 646 | return -EPERM; |
@@ -650,7 +649,7 @@ static int saa7127_s_register(struct v4l2_subdev *sd, struct v4l2_register *reg) | |||
650 | } | 649 | } |
651 | #endif | 650 | #endif |
652 | 651 | ||
653 | static int saa7127_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_chip_ident *chip) | 652 | static int saa7127_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip) |
654 | { | 653 | { |
655 | struct saa7127_state *state = to_state(sd); | 654 | struct saa7127_state *state = to_state(sd); |
656 | struct i2c_client *client = v4l2_get_subdevdata(sd); | 655 | struct i2c_client *client = v4l2_get_subdevdata(sd); |