Skip to content

Commit

Permalink
media: soc_camera/rockchip: Fix the build error
Browse files Browse the repository at this point in the history
As enable the releated config, hit the below error:

drivers/media/i2c/soc_camera/rockchip/adv_camera_module.c:937:34: error:
    assignment to expression with array type
        timings->exposure_valid_frame =
...

and

drivers/media/i2c/soc_camera/rockchip/tc_camera_module.c:963:34: error:
    assignment to expression with array type
        timings->exposure_valid_frame =
....

Change-Id: I4381cc8aa00bb6a968c01d7537a8942b5715fa5c
Signed-off-by: Caesar Wang <[email protected]>
  • Loading branch information
Caesar-github authored and rkhuangtao committed Feb 24, 2018
1 parent 5060d58 commit ddc0536
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/media/i2c/soc_camera/rockchip/adv_camera_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ long adv_camera_module_ioctl(struct v4l2_subdev *sd,
adv_timings.fine_integration_time_min;

if (cam_mod->custom.g_exposure_valid_frame)
timings->exposure_valid_frame =
timings->exposure_valid_frame[0] =
cam_mod->custom.g_exposure_valid_frame(cam_mod);
if (cam_mod->exp_config.exp_time)
timings->exp_time = cam_mod->exp_config.exp_time;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/i2c/soc_camera/rockchip/tc_camera_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ long tc_camera_module_ioctl(struct v4l2_subdev *sd,
tc_timings.fine_integration_time_min;

if (cam_mod->custom.g_exposure_valid_frame)
timings->exposure_valid_frame =
timings->exposure_valid_frame[0] =
cam_mod->custom.g_exposure_valid_frame(cam_mod);
if (cam_mod->exp_config.exp_time)
timings->exp_time = cam_mod->exp_config.exp_time;
Expand Down

0 comments on commit ddc0536

Please sign in to comment.