aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2012-05-16 14:03:50 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-06-25 08:17:24 -0400
commit0b4b1f199d367762ddb68cb3303431fa6c84a7d6 (patch)
tree7ff52a1ccf5ff5a187f5cd621a345f800cb47ac2 /drivers/media
parentd547ab66e275e2f6bf703572e943018ef7c391c5 (diff)
[media] s5p-fimc: Remove superfluous checks for buffer type
The checks are already done at the v4l2 framework. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/s5p-fimc/fimc-capture.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index 13df7230c8d8..0fd12dfbd3db 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -819,9 +819,6 @@ static int fimc_cap_g_fmt_mplane(struct file *file, void *fh,
819 struct fimc_dev *fimc = video_drvdata(file); 819 struct fimc_dev *fimc = video_drvdata(file);
820 struct fimc_ctx *ctx = fimc->vid_cap.ctx; 820 struct fimc_ctx *ctx = fimc->vid_cap.ctx;
821 821
822 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
823 return -EINVAL;
824
825 return fimc_fill_format(&ctx->d_frame, f); 822 return fimc_fill_format(&ctx->d_frame, f);
826} 823}
827 824
@@ -834,9 +831,6 @@ static int fimc_cap_try_fmt_mplane(struct file *file, void *fh,
834 struct v4l2_mbus_framefmt mf; 831 struct v4l2_mbus_framefmt mf;
835 struct fimc_fmt *ffmt = NULL; 832 struct fimc_fmt *ffmt = NULL;
836 833
837 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
838 return -EINVAL;
839
840 if (pix->pixelformat == V4L2_PIX_FMT_JPEG) { 834 if (pix->pixelformat == V4L2_PIX_FMT_JPEG) {
841 fimc_capture_try_format(ctx, &pix->width, &pix->height, 835 fimc_capture_try_format(ctx, &pix->width, &pix->height,
842 NULL, &pix->pixelformat, 836 NULL, &pix->pixelformat,
@@ -888,8 +882,6 @@ static int fimc_capture_set_format(struct fimc_dev *fimc, struct v4l2_format *f)
888 struct fimc_fmt *s_fmt = NULL; 882 struct fimc_fmt *s_fmt = NULL;
889 int ret, i; 883 int ret, i;
890 884
891 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
892 return -EINVAL;
893 if (vb2_is_busy(&fimc->vid_cap.vbq)) 885 if (vb2_is_busy(&fimc->vid_cap.vbq))
894 return -EBUSY; 886 return -EBUSY;
895 887