diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 10:46:54 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:19:06 -0400 |
commit | 08590b9613f7f624fe3a052586eea2dbb3584b38 (patch) | |
tree | a893d250a4edf84e93794be59e2b1d859314c972 /drivers/media/video/mx1_camera.c | |
parent | 961801bbb3448a86f0cc93747cecbfae686d81d1 (diff) |
V4L/DVB (12529): soc-camera: switch to s_crop v4l2-subdev video operation
Remove set_crop soc-camera device method and switch to s_crop from v4l2-subdev
video operations. Also extend non-i2c drivers to also hold a pointer to their
v4l2-subdev instance in control device driver-data, i.e., in
dev_get_drvdata((struct device *)to_soc_camera_control(icd))
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/mx1_camera.c')
-rw-r--r-- | drivers/media/video/mx1_camera.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c index 948a4714be9a..add496fca4d3 100644 --- a/drivers/media/video/mx1_camera.c +++ b/drivers/media/video/mx1_camera.c | |||
@@ -463,9 +463,13 @@ static void mx1_camera_remove_device(struct soc_camera_device *icd) | |||
463 | } | 463 | } |
464 | 464 | ||
465 | static int mx1_camera_set_crop(struct soc_camera_device *icd, | 465 | static int mx1_camera_set_crop(struct soc_camera_device *icd, |
466 | struct v4l2_rect *rect) | 466 | struct v4l2_crop *a) |
467 | { | 467 | { |
468 | return icd->ops->set_crop(icd, rect); | 468 | struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); |
469 | struct device *control = to_soc_camera_control(icd); | ||
470 | struct v4l2_subdev *sd = dev_get_drvdata(control); | ||
471 | |||
472 | return v4l2_subdev_call(sd, video, s_crop, a); | ||
469 | } | 473 | } |
470 | 474 | ||
471 | static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt) | 475 | static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt) |