diff options
-rw-r--r-- | drivers/media/video/msp3400-driver.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tuner-core.c | 2 | ||||
-rw-r--r-- | include/media/v4l2-subdev.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c index 79ae7bd23528..a622dbb72ed8 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, int cmd, void *arg) | 486 | static int 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); |
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 694087bfa77d..97d7509d212f 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -800,7 +800,7 @@ static int tuner_s_standby(struct v4l2_subdev *sd, u32 standby) | |||
800 | } | 800 | } |
801 | 801 | ||
802 | #ifdef CONFIG_VIDEO_ALLOW_V4L1 | 802 | #ifdef CONFIG_VIDEO_ALLOW_V4L1 |
803 | static int tuner_ioctl(struct v4l2_subdev *sd, int cmd, void *arg) | 803 | static int tuner_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) |
804 | { | 804 | { |
805 | struct tuner *t = to_tuner(sd); | 805 | struct tuner *t = to_tuner(sd); |
806 | struct i2c_client *client = v4l2_get_subdevdata(sd); | 806 | struct i2c_client *client = v4l2_get_subdevdata(sd); |
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index bca25e8eab62..ceef016bb0b7 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h | |||
@@ -79,7 +79,7 @@ struct v4l2_subdev_core_ops { | |||
79 | int (*g_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl); | 79 | int (*g_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl); |
80 | int (*s_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl); | 80 | int (*s_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl); |
81 | int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm); | 81 | int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm); |
82 | int (*ioctl)(struct v4l2_subdev *sd, int cmd, void *arg); | 82 | int (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); |
83 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 83 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
84 | int (*g_register)(struct v4l2_subdev *sd, struct v4l2_register *reg); | 84 | int (*g_register)(struct v4l2_subdev *sd, struct v4l2_register *reg); |
85 | int (*s_register)(struct v4l2_subdev *sd, struct v4l2_register *reg); | 85 | int (*s_register)(struct v4l2_subdev *sd, struct v4l2_register *reg); |