Merge tag 'microblaze-4.15-rc2' of git://git.monstr.eu/linux-2.6-microblaze

[sfrench/cifs-2.6.git] / Documentation / media / uapi / cec / cec-ioc-receive.rst

diff --git a/Documentation/media/uapi/cec/cec-ioc-receive.rst b/Documentation/media/uapi/cec/cec-ioc-receive.rst
index 0f397c535a4cde648d5e2e132d25021457cb1418..bdad4b197bcd457196a83800246ae10f8087eb7e 100644 (file)
--- a/Documentation/media/uapi/cec/cec-ioc-receive.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-receive.rst
@@ -131,7 +131,7 @@ View On' messages from initiator 0xf ('Unregistered') to destination 0 ('TV').
       - ``tx_status``
       - The status bits of the transmitted message. See
        :ref:`cec-tx-status` for the possible status values. It is 0 if
-       this messages was received, not transmitted.
+       this message was received, not transmitted.
     * - __u8
       - ``msg[16]``
       - The message payload. For :ref:`ioctl CEC_TRANSMIT <CEC_TRANSMIT>` this is filled in by the
@@ -168,7 +168,7 @@ View On' messages from initiator 0xf ('Unregistered') to destination 0 ('TV').
       - ``tx_status``
       - The status bits of the transmitted message. See
        :ref:`cec-tx-status` for the possible status values. It is 0 if
-       this messages was received, not transmitted.
+       this message was received, not transmitted.
     * - __u8
       - ``tx_arb_lost_cnt``
       - A counter of the number of transmit attempts that resulted in the
@@ -256,9 +256,9 @@ View On' messages from initiator 0xf ('Unregistered') to destination 0 ('TV').
       - ``CEC_TX_STATUS_ERROR``
       - 0x10
       - Some error occurred. This is used for any errors that do not fit
-       the previous two, either because the hardware could not tell which
-       error occurred, or because the hardware tested for other
-       conditions besides those two.
+       ``CEC_TX_STATUS_ARB_LOST`` or ``CEC_TX_STATUS_LOW_DRIVE``, either because
+       the hardware could not tell which error occurred, or because the hardware
+       tested for other conditions besides those two.
     * .. _`CEC-TX-STATUS-MAX-RETRIES`:
 
       - ``CEC_TX_STATUS_MAX_RETRIES``