projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/hda' into for-linus
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
media
/
video
/
s5p-fimc
/
fimc-capture.c
diff --git
a/drivers/media/video/s5p-fimc/fimc-capture.c
b/drivers/media/video/s5p-fimc/fimc-capture.c
index 95f8b4e11e46f71773b9f8f2556a06be094e9510..d142b40ea64efd1135dbfc242b5fd7d4c7092697 100644
(file)
--- a/
drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/
drivers/media/video/s5p-fimc/fimc-capture.c
@@
-527,7
+527,7
@@
static int fimc_cap_s_fmt_mplane(struct file *file, void *priv,
if (ret)
return ret;
if (ret)
return ret;
- if (vb2_is_
streaming
(&fimc->vid_cap.vbq) || fimc_capture_active(fimc))
+ if (vb2_is_
busy
(&fimc->vid_cap.vbq) || fimc_capture_active(fimc))
return -EBUSY;
frame = &ctx->d_frame;
return -EBUSY;
frame = &ctx->d_frame;
@@
-539,8
+539,10
@@
static int fimc_cap_s_fmt_mplane(struct file *file, void *priv,
return -EINVAL;
}
return -EINVAL;
}
- for (i = 0; i < frame->fmt->colplanes; i++)
- frame->payload[i] = pix->plane_fmt[i].bytesperline * pix->height;
+ for (i = 0; i < frame->fmt->colplanes; i++) {
+ frame->payload[i] =
+ (pix->width * pix->height * frame->fmt->depth[i]) >> 3;
+ }
/* Output DMA frame pixel size and offsets. */
frame->f_width = pix->plane_fmt[0].bytesperline * 8
/* Output DMA frame pixel size and offsets. */
frame->f_width = pix->plane_fmt[0].bytesperline * 8