diff options
Diffstat (limited to 'drivers/media/video/saa717x.c')
-rw-r--r-- | drivers/media/video/saa717x.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c index 9befca65905e..454ad1dd7507 100644 --- a/drivers/media/video/saa717x.c +++ b/drivers/media/video/saa717x.c | |||
@@ -1171,25 +1171,26 @@ static int saa717x_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) | |||
1171 | } | 1171 | } |
1172 | 1172 | ||
1173 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 1173 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
1174 | static int saa717x_g_register(struct v4l2_subdev *sd, struct v4l2_register *reg) | 1174 | static int saa717x_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) |
1175 | { | 1175 | { |
1176 | struct i2c_client *client = v4l2_get_subdevdata(sd); | 1176 | struct i2c_client *client = v4l2_get_subdevdata(sd); |
1177 | 1177 | ||
1178 | if (!v4l2_chip_match_i2c_client(client, reg->match_type, reg->match_chip)) | 1178 | if (!v4l2_chip_match_i2c_client(client, ®->match)) |
1179 | return -EINVAL; | 1179 | return -EINVAL; |
1180 | if (!capable(CAP_SYS_ADMIN)) | 1180 | if (!capable(CAP_SYS_ADMIN)) |
1181 | return -EPERM; | 1181 | return -EPERM; |
1182 | reg->val = saa717x_read(sd, reg->reg); | 1182 | reg->val = saa717x_read(sd, reg->reg); |
1183 | reg->size = 1; | ||
1183 | return 0; | 1184 | return 0; |
1184 | } | 1185 | } |
1185 | 1186 | ||
1186 | static int saa717x_s_register(struct v4l2_subdev *sd, struct v4l2_register *reg) | 1187 | static int saa717x_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) |
1187 | { | 1188 | { |
1188 | struct i2c_client *client = v4l2_get_subdevdata(sd); | 1189 | struct i2c_client *client = v4l2_get_subdevdata(sd); |
1189 | u16 addr = reg->reg & 0xffff; | 1190 | u16 addr = reg->reg & 0xffff; |
1190 | u8 val = reg->val & 0xff; | 1191 | u8 val = reg->val & 0xff; |
1191 | 1192 | ||
1192 | if (!v4l2_chip_match_i2c_client(client, reg->match_type, reg->match_chip)) | 1193 | if (!v4l2_chip_match_i2c_client(client, ®->match)) |
1193 | return -EINVAL; | 1194 | return -EINVAL; |
1194 | if (!capable(CAP_SYS_ADMIN)) | 1195 | if (!capable(CAP_SYS_ADMIN)) |
1195 | return -EPERM; | 1196 | return -EPERM; |