diff options
| author | Jacek Anaszewski | 2013-11-25 10:58:11 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-12-18 09:12:45 +0100 |
| commit | 170f55bd85d19b06d825c18462fcb5985d6e5508 (patch) | |
| tree | 986407d7de5e1f63d358a9b43caa914d9b4202e0 /drivers/media/platform/s5p-jpeg | |
| parent | [media] s5p-jpeg: Fix erroneous condition while validating bytesperline value (diff) | |
| download | kernel-qcow2-linux-170f55bd85d19b06d825c18462fcb5985d6e5508.tar.gz kernel-qcow2-linux-170f55bd85d19b06d825c18462fcb5985d6e5508.tar.xz kernel-qcow2-linux-170f55bd85d19b06d825c18462fcb5985d6e5508.zip | |
[media] s5p-jpeg: Remove superfluous call to the jpeg_bound_align_image function
Aligning capture queue image dimensions while enqueuing output
queue doesn't make a sense as the S_FMT ioctl might have not
been called for the capture queue until that moment, whereas
it is required to know capture format as the type of alignment
heavily depends on it.
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.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')
| -rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-core.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index c5b7d926dff8..c5b6873eca71 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1089,13 +1089,6 @@ static void s5p_jpeg_buf_queue(struct vb2_buffer *vb) q_data = &ctx->cap_q; q_data->w = tmp.w; q_data->h = tmp.h; - - jpeg_bound_align_image(&q_data->w, S5P_JPEG_MIN_WIDTH, - S5P_JPEG_MAX_WIDTH, q_data->fmt->h_align, - &q_data->h, S5P_JPEG_MIN_HEIGHT, - S5P_JPEG_MAX_HEIGHT, q_data->fmt->v_align - ); - q_data->size = q_data->w * q_data->h * q_data->fmt->depth >> 3; } v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); |