From 9eb229e7349648baf85fcad3dbafe973ec96299d Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 12 Jun 2014 15:58:23 +0200 Subject: [PATCH] v4l2-compliance: fix broken querymenu check. QUERYMENU can also return -ENOTTY if it isn't implemented at all. Allow for that. Signed-off-by: Hans Verkuil --- utils/v4l2-compliance/v4l2-test-controls.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/v4l2-compliance/v4l2-test-controls.cpp b/utils/v4l2-compliance/v4l2-test-controls.cpp index 744d629..2c97df5 100644 --- a/utils/v4l2-compliance/v4l2-test-controls.cpp +++ b/utils/v4l2-compliance/v4l2-test-controls.cpp @@ -141,7 +141,7 @@ static int checkQCtrl(struct node *node, struct test_queryctrl &qctrl) qmenu.id = qctrl.id; qmenu.index = qctrl.minimum; ret = doioctl(node, VIDIOC_QUERYMENU, &qmenu); - if (ret != EINVAL) + if (ret != EINVAL && ret != ENOTTY) return fail("can do querymenu on a non-menu control\n"); return 0; } -- 2.7.4