media: vicodec: selection api should only check single buffer types

The selection api should check only single buffer types
because multiplanar types are converted to
single in drivers/media/v4l2-core/v4l2-ioctl.c

Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
index 39433ffdf4174c7230a88fa05d1028cac966aab9..570d5d0a17ad5c0b0a4d6d9dfe48adad071a8eaa 100644 (file)
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -944,16 +944,6 @@ static int vidioc_g_selection(struct file *file, void *priv,
 {
        struct vicodec_ctx *ctx = file2ctx(file);
        struct vicodec_q_data *q_data;
-       enum v4l2_buf_type valid_cap_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-       enum v4l2_buf_type valid_out_type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
-
-       if (multiplanar) {
-               valid_cap_type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-               valid_out_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-       }
-
-       if (s->type != valid_cap_type && s->type != valid_out_type)
-               return -EINVAL;
 
        q_data = get_q_data(ctx, s->type);
        if (!q_data)
@@ -962,8 +952,8 @@ static int vidioc_g_selection(struct file *file, void *priv,
         * encoder supports only cropping on the OUTPUT buffer
         * decoder supports only composing on the CAPTURE buffer
         */
-       if ((ctx->is_enc && s->type == valid_out_type) ||
-           (!ctx->is_enc && s->type == valid_cap_type)) {
+       if ((ctx->is_enc && s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) ||
+           (!ctx->is_enc && s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
                switch (s->target) {
                case V4L2_SEL_TGT_COMPOSE:
                case V4L2_SEL_TGT_CROP:
@@ -991,12 +981,8 @@ static int vidioc_s_selection(struct file *file, void *priv,
 {
        struct vicodec_ctx *ctx = file2ctx(file);
        struct vicodec_q_data *q_data;
-       enum v4l2_buf_type out_type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
-
-       if (multiplanar)
-               out_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
 
-       if (s->type != out_type)
+       if (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
                return -EINVAL;
 
        q_data = get_q_data(ctx, s->type);