diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-08-22 15:40:38 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-08-22 15:40:38 -0600 |
| commit | 8d8f60c5e0cdc05bd9785faffd1cc034acdcd6d6 (patch) | |
| tree | 41554684ad5904924b3108cbec4debffe56b90b2 /Documentation/media | |
| parent | e349b1b700c1fda12380cd5dcf6af8a3b82edff3 (diff) | |
| parent | ca7bfe2c8d9f3aee469a3a36110a95ebb511ee20 (diff) | |
| download | linux-8d8f60c5e0cdc05bd9785faffd1cc034acdcd6d6.tar.gz linux-8d8f60c5e0cdc05bd9785faffd1cc034acdcd6d6.tar.bz2 linux-8d8f60c5e0cdc05bd9785faffd1cc034acdcd6d6.zip | |
Merge branch 'doc/4.9' into docs-next
Diffstat (limited to 'Documentation/media')
| -rw-r--r-- | Documentation/media/uapi/cec/cec-func-open.rst | 2 | ||||
| -rw-r--r-- | Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/media/uapi/cec/cec-func-open.rst b/Documentation/media/uapi/cec/cec-func-open.rst index 38fd7e0cfccd..7c0f981a6e07 100644 --- a/Documentation/media/uapi/cec/cec-func-open.rst +++ b/Documentation/media/uapi/cec/cec-func-open.rst @@ -32,7 +32,7 @@ Arguments Open flags. Access mode must be ``O_RDWR``. When the ``O_NONBLOCK`` flag is given, the - :ref:`CEC_RECEIVE <CEC_RECEIVE>` and :ref:`CEC_DQEVENT <CEC_DQEVENT>` ioctls + :ref:`CEC_RECEIVE <CEC_RECEIVE>` and :c:func:`CEC_DQEVENT` ioctls will return the ``EAGAIN`` error code when no message or event is available, and ioctls :ref:`CEC_TRANSMIT <CEC_TRANSMIT>`, :ref:`CEC_ADAP_S_PHYS_ADDR <CEC_ADAP_S_PHYS_ADDR>` and diff --git a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst index 7a6d6d00ce19..4e12e6cd88ee 100644 --- a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst +++ b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst @@ -15,7 +15,8 @@ CEC_DQEVENT - Dequeue a CEC event Synopsis ======== -.. cpp:function:: int ioctl( int fd, int request, struct cec_event *argp ) +.. c:function:: int ioctl( int fd, int request, struct cec_event *argp ) + :name: CEC_DQEVENT Arguments ========= @@ -36,7 +37,7 @@ Description and is currently only available as a staging kernel module. CEC devices can send asynchronous events. These can be retrieved by -calling :ref:`ioctl CEC_DQEVENT <CEC_DQEVENT>`. If the file descriptor is in +calling :c:func:`CEC_DQEVENT`. If the file descriptor is in non-blocking mode and no event is pending, then it will return -1 and set errno to the ``EAGAIN`` error code. |