aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/mx3_camera.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/mx3_camera.c')
-rw-r--r--drivers/media/video/mx3_camera.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index b3016adb0f4f..6c87d966a554 100644
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -265,13 +265,10 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
265 struct idmac_channel *ichan = mx3_cam->idmac_channel[0]; 265 struct idmac_channel *ichan = mx3_cam->idmac_channel[0];
266 struct idmac_video_param *video = &ichan->params.video; 266 struct idmac_video_param *video = &ichan->params.video;
267 const struct soc_mbus_pixelfmt *host_fmt = icd->current_fmt->host_fmt; 267 const struct soc_mbus_pixelfmt *host_fmt = icd->current_fmt->host_fmt;
268 int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width, host_fmt);
269 unsigned long flags; 268 unsigned long flags;
270 dma_cookie_t cookie; 269 dma_cookie_t cookie;
271 size_t new_size; 270 size_t new_size;
272 271
273 BUG_ON(bytes_per_line <= 0);
274
275 new_size = icd->sizeimage; 272 new_size = icd->sizeimage;
276 273
277 if (vb2_plane_size(vb, 0) < new_size) { 274 if (vb2_plane_size(vb, 0) < new_size) {
@@ -312,9 +309,9 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
312 * horizontal parameters in this case are expressed in bytes, 309 * horizontal parameters in this case are expressed in bytes,
313 * not in pixels. 310 * not in pixels.
314 */ 311 */
315 video->out_width = bytes_per_line; 312 video->out_width = icd->bytesperline;
316 video->out_height = icd->user_height; 313 video->out_height = icd->user_height;
317 video->out_stride = bytes_per_line; 314 video->out_stride = icd->bytesperline;
318 } else { 315 } else {
319 /* 316 /*
320 * For IPU known formats the pixel unit will be managed 317 * For IPU known formats the pixel unit will be managed