| Message ID | 1375189163-32510-1-git-send-email-ricardo.ribalda@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue 30 July 2013 14:59:23 Ricardo Ribalda Delgado wrote: > Otherwise the driver can never return a register Good catch! I didn't test this as root, which I should have done. Thanks! Hans > > Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> > --- > utils/v4l2-compliance/v4l2-test-debug.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/v4l2-compliance/v4l2-test-debug.cpp b/utils/v4l2-compliance/v4l2-test-debug.cpp > index 90c5b90..fa42d2c 100644 > --- a/utils/v4l2-compliance/v4l2-test-debug.cpp > +++ b/utils/v4l2-compliance/v4l2-test-debug.cpp > @@ -49,7 +49,7 @@ int testRegister(struct node *node) > return ret; > // Not allowed to call VIDIOC_DBG_G_REGISTER unless root > fail_on_test(uid && ret != EPERM); > - fail_on_test(uid == 0 && ret != EINVAL); > + fail_on_test(uid == 0 && ret && ret != EINVAL); > fail_on_test(uid == 0 && !ret && reg.size == 0); > chip.match.type = V4L2_CHIP_MATCH_BRIDGE; > chip.match.addr = 0; > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/utils/v4l2-compliance/v4l2-test-debug.cpp b/utils/v4l2-compliance/v4l2-test-debug.cpp index 90c5b90..fa42d2c 100644 --- a/utils/v4l2-compliance/v4l2-test-debug.cpp +++ b/utils/v4l2-compliance/v4l2-test-debug.cpp @@ -49,7 +49,7 @@ int testRegister(struct node *node) return ret; // Not allowed to call VIDIOC_DBG_G_REGISTER unless root fail_on_test(uid && ret != EPERM); - fail_on_test(uid == 0 && ret != EINVAL); + fail_on_test(uid == 0 && ret && ret != EINVAL); fail_on_test(uid == 0 && !ret && reg.size == 0); chip.match.type = V4L2_CHIP_MATCH_BRIDGE; chip.match.addr = 0;
Otherwise the driver can never return a register Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> --- utils/v4l2-compliance/v4l2-test-debug.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)