diff options
Diffstat (limited to 'drivers/media/video/msp3400-driver.c')
-rw-r--r-- | drivers/media/video/msp3400-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c index a622dbb72ed8..4d7a91852117 100644 --- a/drivers/media/video/msp3400-driver.c +++ b/drivers/media/video/msp3400-driver.c | |||
@@ -483,7 +483,7 @@ static int msp_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) | |||
483 | } | 483 | } |
484 | 484 | ||
485 | #ifdef CONFIG_VIDEO_ALLOW_V4L1 | 485 | #ifdef CONFIG_VIDEO_ALLOW_V4L1 |
486 | static int msp_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) | 486 | static long msp_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) |
487 | { | 487 | { |
488 | struct msp_state *state = to_state(sd); | 488 | struct msp_state *state = to_state(sd); |
489 | struct i2c_client *client = v4l2_get_subdevdata(sd); | 489 | struct i2c_client *client = v4l2_get_subdevdata(sd); |
@@ -733,7 +733,7 @@ static int msp_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) | |||
733 | return 0; | 733 | return 0; |
734 | } | 734 | } |
735 | 735 | ||
736 | static int msp_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_chip_ident *chip) | 736 | static int msp_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip) |
737 | { | 737 | { |
738 | struct msp_state *state = to_state(sd); | 738 | struct msp_state *state = to_state(sd); |
739 | struct i2c_client *client = v4l2_get_subdevdata(sd); | 739 | struct i2c_client *client = v4l2_get_subdevdata(sd); |