aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-jpeg
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2013-11-25 04:58:11 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-12-18 03:12:45 -0500
commit170f55bd85d19b06d825c18462fcb5985d6e5508 (patch)
tree986407d7de5e1f63d358a9b43caa914d9b4202e0 /drivers/media/platform/s5p-jpeg
parentcc690904247fdbb169e2544cbbbd4ebd2c05f8cb (diff)
[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.c7
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)
1089 q_data = &ctx->cap_q; 1089 q_data = &ctx->cap_q;
1090 q_data->w = tmp.w; 1090 q_data->w = tmp.w;
1091 q_data->h = tmp.h; 1091 q_data->h = tmp.h;
1092
1093 jpeg_bound_align_image(&q_data->w, S5P_JPEG_MIN_WIDTH,
1094 S5P_JPEG_MAX_WIDTH, q_data->fmt->h_align,
1095 &q_data->h, S5P_JPEG_MIN_HEIGHT,
1096 S5P_JPEG_MAX_HEIGHT, q_data->fmt->v_align
1097 );
1098 q_data->size = q_data->w * q_data->h * q_data->fmt->depth >> 3;
1099 } 1092 }
1100 1093
1101 v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); 1094 v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);