summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2014-04-10 07:32:15 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-11-18 03:01:12 (GMT)
commit7d882f781d64361fe4fc923edc38464388118782 (patch)
treebf9ba9df3d292bfe742c7426d3fa4db23cb2e8c9
parent37572357e0aafbde4d8d86869f05bdb6e8105795 (diff)
downloadlinux-3.10-7d882f781d64361fe4fc923edc38464388118782.zip
linux-3.10-7d882f781d64361fe4fc923edc38464388118782.tar.gz
linux-3.10-7d882f781d64361fe4fc923edc38464388118782.tar.bz2
[media] s5p-jpeg: g_selection callback should always succeed
Remove erroneous guard preventing successful execution of g_selection callback in case the driver variant is different from SJPEG_S5P. Change-Id: I4db87c0abfc0fd15ec8ae137192e522136ecec1b 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>
-rw-r--r--drivers/media/platform/s5p-jpeg/jpeg-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 4a98154..ff678f9 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -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 */