]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
[media] s5p-jpeg: g_selection callback should always succeed
authorJacek Anaszewski <j.anaszewski@samsung.com>
Thu, 10 Apr 2014 07:32:15 +0000 (04:32 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 13 May 2014 23:19:48 +0000 (20:19 -0300)
Remove erroneous guard preventing successful execution of
g_selection callback in case the driver variant is different
from SJPEG_S5P.

Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/platform/s5p-jpeg/jpeg-core.c

index 4a981540f89915927705c576e669ff6319c34cdc..ff678f9dfc49d0794b4d6f99105e5985954dd4d3 100644 (file)
@@ -1177,8 +1177,7 @@ static int s5p_jpeg_g_selection(struct file *file, void *priv,
        struct s5p_jpeg_ctx *ctx = fh_to_ctx(priv);
 
        if (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT &&
-           s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
-           ctx->jpeg->variant->version != SJPEG_S5P)
+           s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
 
        /* For JPEG blob active == default == bounds */