diff options
| author | Jacek Anaszewski | 2014-04-10 09:32:15 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-05-14 01:19:48 +0200 |
| commit | 38a6ef3374087505a9b0a1abde4fd96798767d1e (patch) | |
| tree | e8502595d9d79350ee83fbbfb5c137587c2e930c /drivers/media/platform/s5p-jpeg/jpeg-core.c | |
| parent | [media] s5p-jpeg: Add m2m_ops field to the s5p_jpeg_variant structure (diff) | |
| download | kernel-qcow2-linux-38a6ef3374087505a9b0a1abde4fd96798767d1e.tar.gz kernel-qcow2-linux-38a6ef3374087505a9b0a1abde4fd96798767d1e.tar.xz kernel-qcow2-linux-38a6ef3374087505a9b0a1abde4fd96798767d1e.zip | |
[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.
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>
Diffstat (limited to 'drivers/media/platform/s5p-jpeg/jpeg-core.c')
| -rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-core.c | 3 |
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 4a981540f899..ff678f9dfc49 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 */ |