diff options
Diffstat (limited to 'drivers/media/video/mt9m111.c')
-rw-r--r-- | drivers/media/video/mt9m111.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c index 45101fd90ce0..bef415170186 100644 --- a/drivers/media/video/mt9m111.c +++ b/drivers/media/video/mt9m111.c | |||
@@ -395,11 +395,12 @@ static int mt9m111_set_bus_param(struct soc_camera_device *icd, unsigned long f) | |||
395 | return 0; | 395 | return 0; |
396 | } | 396 | } |
397 | 397 | ||
398 | static int mt9m111_set_crop(struct soc_camera_device *icd, | 398 | static int mt9m111_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) |
399 | struct v4l2_rect *rect) | ||
400 | { | 399 | { |
401 | struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd)); | 400 | struct v4l2_rect *rect = &a->c; |
401 | struct i2c_client *client = sd->priv; | ||
402 | struct mt9m111 *mt9m111 = to_mt9m111(client); | 402 | struct mt9m111 *mt9m111 = to_mt9m111(client); |
403 | struct soc_camera_device *icd = client->dev.platform_data; | ||
403 | int ret; | 404 | int ret; |
404 | 405 | ||
405 | dev_dbg(&icd->dev, "%s left=%d, top=%d, width=%d, height=%d\n", | 406 | dev_dbg(&icd->dev, "%s left=%d, top=%d, width=%d, height=%d\n", |
@@ -601,7 +602,6 @@ static struct soc_camera_ops mt9m111_ops = { | |||
601 | .init = mt9m111_init, | 602 | .init = mt9m111_init, |
602 | .resume = mt9m111_resume, | 603 | .resume = mt9m111_resume, |
603 | .release = mt9m111_release, | 604 | .release = mt9m111_release, |
604 | .set_crop = mt9m111_set_crop, | ||
605 | .query_bus_param = mt9m111_query_bus_param, | 605 | .query_bus_param = mt9m111_query_bus_param, |
606 | .set_bus_param = mt9m111_set_bus_param, | 606 | .set_bus_param = mt9m111_set_bus_param, |
607 | .controls = mt9m111_controls, | 607 | .controls = mt9m111_controls, |
@@ -908,6 +908,7 @@ static struct v4l2_subdev_core_ops mt9m111_subdev_core_ops = { | |||
908 | static struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = { | 908 | static struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = { |
909 | .s_fmt = mt9m111_s_fmt, | 909 | .s_fmt = mt9m111_s_fmt, |
910 | .try_fmt = mt9m111_try_fmt, | 910 | .try_fmt = mt9m111_try_fmt, |
911 | .s_crop = mt9m111_s_crop, | ||
911 | }; | 912 | }; |
912 | 913 | ||
913 | static struct v4l2_subdev_ops mt9m111_subdev_ops = { | 914 | static struct v4l2_subdev_ops mt9m111_subdev_ops = { |