summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2015-03-06 11:24:04 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-02 20:29:48 -0300
commita94e7d6e825ac20f17436477120fb3fd8a755ebf (patch)
treef4f587f3f6d78bae8c0f1a57c37c971380a4b542 /drivers/media/platform
parent360565fcf72637258ebe6d3984c669bc9d86f7cd (diff)
downloadtalos-obmc-linux-a94e7d6e825ac20f17436477120fb3fd8a755ebf.tar.gz
talos-obmc-linux-a94e7d6e825ac20f17436477120fb3fd8a755ebf.zip
[media] vivid: wrong top/bottom order for FIELD_ALTERNATE
The condition to decide whether the current field is top or bottom was inverted. Fix this. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/vivid/vivid-kthread-cap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vivid/vivid-kthread-cap.c b/drivers/media/platform/vivid/vivid-kthread-cap.c
index 39a67cfae120..9898072e9a40 100644
--- a/drivers/media/platform/vivid/vivid-kthread-cap.c
+++ b/drivers/media/platform/vivid/vivid-kthread-cap.c
@@ -427,7 +427,7 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
* standards.
*/
buf->vb.v4l2_buf.field = ((dev->vid_cap_seq_count & 1) ^ is_60hz) ?
- V4L2_FIELD_TOP : V4L2_FIELD_BOTTOM;
+ V4L2_FIELD_BOTTOM : V4L2_FIELD_TOP;
/*
* The sequence counter counts frames, not fields. So divide
* by two.
OpenPOWER on IntegriCloud