| From 96bce9c58cad1b2b3b183868c49dbaa4da3a2af6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 9 Jan 2019 13:00:41 -0500 |
| Subject: media: s5p-jpeg: Correct step and max values for |
| V4L2_CID_JPEG_RESTART_INTERVAL |
| |
| From: Pawe? Chmiel <pawel.mikolaj.chmiel@gmail.com> |
| |
| [ Upstream commit 19c624c6b29e244c418f8b44a711cbf5e82e3cd4 ] |
| |
| This commit corrects max and step values for v4l2 control for |
| V4L2_CID_JPEG_RESTART_INTERVAL. Max should be 0xffff and step should be 1. |
| It was found by using v4l2-compliance tool and checking result of |
| VIDIOC_QUERY_EXT_CTRL/QUERYMENU test. |
| Previously it was complaining that step was bigger than difference |
| between max and min. |
| |
| Fixes: 15f4bc3b1f42 ("[media] s5p-jpeg: Add JPEG controls support") |
| |
| Signed-off-by: Pawe? Chmiel <pawel.mikolaj.chmiel@gmail.com> |
| Reviewed-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> |
| Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c |
| index c89922fb42cef..a63f4eec366eb 100644 |
| --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c |
| +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c |
| @@ -1963,7 +1963,7 @@ static int s5p_jpeg_controls_create(struct s5p_jpeg_ctx *ctx) |
| |
| v4l2_ctrl_new_std(&ctx->ctrl_handler, &s5p_jpeg_ctrl_ops, |
| V4L2_CID_JPEG_RESTART_INTERVAL, |
| - 0, 3, 0xffff, 0); |
| + 0, 0xffff, 1, 0); |
| if (ctx->jpeg->variant->version == SJPEG_S5P) |
| mask = ~0x06; /* 422, 420 */ |
| } |
| -- |
| 2.20.1 |
| |
