aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2015-12-18 00:46:52 +0100
committerHans Verkuil <hans.verkuil@cisco.com>2015-12-18 00:46:52 +0100
commitbcf07e6921cafbc4a85f5f1d1a88fde8cbac8d98 (patch)
treec8a13dde29c93fe699cad86fea20dc63f7ba1033
parentde6f8ed26f2bcfc0c65785583b80cffde21de0fd (diff)
v4l-helpers.h: fix regression
Commit 1f598673e2db8fc216654b805c68756396d0f6f8 (drop the use of fancy initializers) introduced a bug in the control handling: instead of filling the id field the flags field was set. This caused control enumeration in qv4l2 to fail (and most likely this also caused problems in v4l2-compliance). Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
-rw-r--r--utils/v4l2-compliance/v4l-helpers.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/v4l2-compliance/v4l-helpers.h b/utils/v4l2-compliance/v4l-helpers.h
index e530724c..e402ec76 100644
--- a/utils/v4l2-compliance/v4l-helpers.h
+++ b/utils/v4l2-compliance/v4l-helpers.h
@@ -403,10 +403,10 @@ static inline int v4l_open(struct v4l_fd *f, const char *devname, bool non_block
struct v4l2_selection sel;
memset(&qec, 0, sizeof(qec));
- qec.flags = V4L2_CTRL_FLAG_NEXT_CTRL | V4L2_CTRL_FLAG_NEXT_COMPOUND;
+ qec.id = V4L2_CTRL_FLAG_NEXT_CTRL | V4L2_CTRL_FLAG_NEXT_COMPOUND;
memset(&ec, 0, sizeof(ec));
memset(&qc, 0, sizeof(qc));
- qc.flags = V4L2_CTRL_FLAG_NEXT_CTRL;
+ qc.id = V4L2_CTRL_FLAG_NEXT_CTRL;
memset(&sel, 0, sizeof(sel));
f->fd = f->open(f, devname, O_RDWR | (non_blocking ? O_NONBLOCK : 0));

Privacy Policy