diff --git a/[refs] b/[refs] index 2fea09fedf70..257d3a1ac4c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b080c5df00e431baec09222aa8d623f0cd77314 +refs/heads/master: 860553023bfed0179b3fe5d01838635f54a314a3 diff --git a/trunk/Documentation/DocBook/v4l/vidioc-queryctrl.xml b/trunk/Documentation/DocBook/v4l/vidioc-queryctrl.xml index 4876ff1a1a04..8e0e055ac934 100644 --- a/trunk/Documentation/DocBook/v4l/vidioc-queryctrl.xml +++ b/trunk/Documentation/DocBook/v4l/vidioc-queryctrl.xml @@ -325,7 +325,7 @@ should be part of the control documentation. n/a This is not a control. When VIDIOC_QUERYCTRL is called with a control ID -equal to a control class code (see ), the +equal to a control class code (see ) + 1, the ioctl returns the name of the control class and this control type. Older drivers which do not support this feature return an &EINVAL;.