diff options
Diffstat (limited to 'drivers/media/video/ov772x.c')
-rw-r--r-- | drivers/media/video/ov772x.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c index 96964b79afac..76f296642db6 100644 --- a/drivers/media/video/ov772x.c +++ b/drivers/media/video/ov772x.c | |||
@@ -755,9 +755,9 @@ static int ov772x_set_register(struct soc_camera_device *icd, | |||
755 | } | 755 | } |
756 | #endif | 756 | #endif |
757 | 757 | ||
758 | static int ov772x_set_fmt_cap(struct soc_camera_device *icd, | 758 | static int ov772x_set_fmt(struct soc_camera_device *icd, |
759 | __u32 pixfmt, | 759 | __u32 pixfmt, |
760 | struct v4l2_rect *rect) | 760 | struct v4l2_rect *rect) |
761 | { | 761 | { |
762 | struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd); | 762 | struct ov772x_priv *priv = container_of(icd, struct ov772x_priv, icd); |
763 | int ret = -EINVAL; | 763 | int ret = -EINVAL; |
@@ -778,8 +778,8 @@ static int ov772x_set_fmt_cap(struct soc_camera_device *icd, | |||
778 | return ret; | 778 | return ret; |
779 | } | 779 | } |
780 | 780 | ||
781 | static int ov772x_try_fmt_cap(struct soc_camera_device *icd, | 781 | static int ov772x_try_fmt(struct soc_camera_device *icd, |
782 | struct v4l2_format *f) | 782 | struct v4l2_format *f) |
783 | { | 783 | { |
784 | struct v4l2_pix_format *pix = &f->fmt.pix; | 784 | struct v4l2_pix_format *pix = &f->fmt.pix; |
785 | struct ov772x_priv *priv; | 785 | struct ov772x_priv *priv; |
@@ -868,8 +868,8 @@ static struct soc_camera_ops ov772x_ops = { | |||
868 | .release = ov772x_release, | 868 | .release = ov772x_release, |
869 | .start_capture = ov772x_start_capture, | 869 | .start_capture = ov772x_start_capture, |
870 | .stop_capture = ov772x_stop_capture, | 870 | .stop_capture = ov772x_stop_capture, |
871 | .set_fmt_cap = ov772x_set_fmt_cap, | 871 | .set_fmt = ov772x_set_fmt, |
872 | .try_fmt_cap = ov772x_try_fmt_cap, | 872 | .try_fmt = ov772x_try_fmt, |
873 | .set_bus_param = ov772x_set_bus_param, | 873 | .set_bus_param = ov772x_set_bus_param, |
874 | .query_bus_param = ov772x_query_bus_param, | 874 | .query_bus_param = ov772x_query_bus_param, |
875 | .get_chip_id = ov772x_get_chip_id, | 875 | .get_chip_id = ov772x_get_chip_id, |