aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst2
-rw-r--r--Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst b/Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst
index bd580232be10..e1afc5b504c2 100644
--- a/Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst
+++ b/Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst
@@ -113,7 +113,7 @@ than the number requested.
- Set by the driver. If 0, then the driver doesn't support
capabilities. In that case all you know is that the driver is
guaranteed to support ``V4L2_MEMORY_MMAP`` and *might* support
- other :c:type:`v4l2_memory` types. It will not support any others
+ other :c:type:`v4l2_memory` types. It will not support any other
capabilities. See :ref:`here <v4l2-buf-capabilities>` for a list of the
capabilities.
diff --git a/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst b/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst
index 79884bb4893b..b6d52083707b 100644
--- a/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst
+++ b/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst
@@ -104,7 +104,7 @@ aborting or finishing any DMA in progress, an implicit
- Set by the driver. If 0, then the driver doesn't support
capabilities. In that case all you know is that the driver is
guaranteed to support ``V4L2_MEMORY_MMAP`` and *might* support
- other :c:type:`v4l2_memory` types. It will not support any others
+ other :c:type:`v4l2_memory` types. It will not support any other
capabilities.
If you want to query the capabilities with a minimum of side-effects,
class='deletions'>-1/+3 2023-04-26riscv: Allow to downgrade paging mode from the command lineAlexandre Ghiti10-9/+154 2023-04-26dt-bindings: riscv: add sv57 mmu-typeConor Dooley1-0/+1 2023-04-26tracing: Add missing spaces in trace_print_hex_seq()Ken Lin1-1/+4 2023-04-26ring-buffer: Ensure proper resetting of atomic variables in ring_buffer_reset...Tze-nan Wu1-3/+13 2023-04-26net: phy: hide the PHYLIB_LEDS knobPaolo Abeni1-3/+1 2023-04-26powerpc/64s: Disable pcrel code model on ClangNicholas Piggin1-1/+6 2023-04-26powerpc: Fix merge conflict between pcrel and copy_thread changesNicholas Piggin1-1/+1 2023-04-25RISC-V: hwprobe: Remove __init on probe_vendor_features()Evan Green3-6/+6 2023-04-25recordmcount: Fix memory leaks in the uwrite functionHao Zeng1-1/+5 2023-04-25tracing/user_events: Limit max fault-in attemptsBeau Belgrave1-14/+35 2023-04-25tracing/user_events: Prevent same address and bit per processBeau Belgrave2-1/+49 2023-04-25tracing/user_events: Ensure bit is cleared on unregisterBeau Belgrave2-3/+40 2023-04-25tracing/user_events: Ensure write index cannot be negativeBeau Belgrave2-0/+8 2023-04-25seq_buf: Add seq_buf_do_printk() helperSergey Senozhatsky2-0/+34 2023-04-25tracing: Fix print_fields() for __dyn_loc/__rel_locBeau Belgrave1-4/+6 2023-04-25tracing/user_events: Set event filter_type from typeBeau Belgrave1-0/+3 2023-04-25ring-buffer: Clearly check null ptr returned by rb_set_head_page()Zheng Yejian1-2/+3 2023-04-25rtla/timerlat: Fix "Previous IRQ" auto analysis' lineDaniel Bristot de Oliveira1-1/+1 2023-04-25rtla/timerlat: Add auto-analysis only optionDaniel Bristot de Oliveira2-5/+51 2023-04-25rv: Remove redundant assignment to variable retvalColin Ian King1-2/+0 2023-04-25rv: Fix addition on an uninitialized variable 'run'Colin Ian King1-1/+1