diff options
Diffstat (limited to 'drivers/media/video/soc_camera.c')
-rw-r--r-- | drivers/media/video/soc_camera.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index e86e6bda1b7f..90077cb4fe66 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
@@ -98,28 +98,11 @@ static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv, | |||
98 | struct soc_camera_file *icf = file->private_data; | 98 | struct soc_camera_file *icf = file->private_data; |
99 | struct soc_camera_device *icd = icf->icd; | 99 | struct soc_camera_device *icd = icf->icd; |
100 | struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); | 100 | struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); |
101 | enum v4l2_field field; | ||
102 | int ret; | ||
103 | 101 | ||
104 | WARN_ON(priv != file->private_data); | 102 | WARN_ON(priv != file->private_data); |
105 | 103 | ||
106 | /* | ||
107 | * TODO: this might also have to migrate to host-drivers, if anyone | ||
108 | * wishes to support other fields | ||
109 | */ | ||
110 | field = f->fmt.pix.field; | ||
111 | |||
112 | if (field == V4L2_FIELD_ANY) { | ||
113 | f->fmt.pix.field = V4L2_FIELD_NONE; | ||
114 | } else if (field != V4L2_FIELD_NONE) { | ||
115 | dev_err(&icd->dev, "Field type invalid.\n"); | ||
116 | return -EINVAL; | ||
117 | } | ||
118 | |||
119 | /* limit format to hardware capabilities */ | 104 | /* limit format to hardware capabilities */ |
120 | ret = ici->ops->try_fmt(icd, f); | 105 | return ici->ops->try_fmt(icd, f); |
121 | |||
122 | return ret; | ||
123 | } | 106 | } |
124 | 107 | ||
125 | static int soc_camera_enum_input(struct file *file, void *priv, | 108 | static int soc_camera_enum_input(struct file *file, void *priv, |